Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"language": "java",
"repository": "https://github.com/Azure/azure-sdk-for-java",
"releaseTag": {
"regexMatch": "^(?!azure-resourcemanager.*_.+-hybrid)azure-resourcemanager.*_.+$",
"regexMatch": "^(com\\.azure\\.resourcemanager\\+)?(?!azure-resourcemanager.*_.+-hybrid)azure-resourcemanager.*_.+$",
"packageRegexGroup": "(.*)_.*",
"versionRegexGroup": ".*_(.*)"
},
Expand Down
15 changes: 13 additions & 2 deletions tools/azure-rest-api-specs-examples-automation/java/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,15 @@ def create_java_examples(release: Release, sdk_examples_path: str, java_examples
return True, files


def get_package_name(sdk_package: str) -> str:
# new release tag would be "com.azure.resourcemanager+azure-resourcemanager-storage_1.0.1-beta.1", while older be "azure-resourcemanager-storage_1.0.1-beta.1"
sdk_group_id_prefix = "com.azure.resourcemanager+"
if sdk_package.startswith(sdk_group_id_prefix):
# remove groupId "com.azure.resourcemanager+" of management-plane lib
sdk_package = sdk_package.replace(sdk_group_id_prefix, "", 1)
return sdk_package


def main():
global script_path
global tmp_path
Expand All @@ -341,11 +350,13 @@ def main():
sdk_examples_path = config["sdkExamplesPath"]
tmp_path = config["tempPath"]

sdk_package = get_package_name(config["release"]["package"])

release = Release(
config["release"]["tag"],
config["release"]["package"],
sdk_package,
config["release"]["version"],
get_sdk_name_from_package(config["release"]["package"]),
get_sdk_name_from_package(sdk_package),
)

java_examples_relative_path = path.join("sdk", release.sdk_name, release.package, "src", "samples")
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import unittest

from main import get_package_name


class TestMain(unittest.TestCase):

def test_sdk_package(self):
self.assertEqual(
"azure-resourcemanager-storage", get_package_name("com.azure.resourcemanager+azure-resourcemanager-storage")
)
self.assertEqual("azure-resourcemanager-storage", get_package_name("azure-resourcemanager-storage"))