From a83ac50d38fbf20061aac87eeae4a7dd89c90f66 Mon Sep 17 00:00:00 2001
From: Xiaofei Cao <92354331+XiaofeiCao@users.noreply.github.com>
Date: Thu, 25 May 2023 15:37:39 +0800
Subject: [PATCH] mgmt, fix autocent, and acr docs (#35153)
* fix acr dedicatedDataEndpoints javadocs
* fix autocent, with service suffix
---
sdk/resourcemanager/autocent.js | 19 ++++++++++++++++---
.../containerregistry/models/Registry.java | 12 ++++++------
2 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/sdk/resourcemanager/autocent.js b/sdk/resourcemanager/autocent.js
index e4a4d98d64d32..c9668301c968e 100644
--- a/sdk/resourcemanager/autocent.js
+++ b/sdk/resourcemanager/autocent.js
@@ -75,7 +75,7 @@ async function readPom(artifact, version) {
console.log("[WARN] no package tag found in version %s for service %s.", version, artifact);
} else {
var tag = match[1];
- var service = artifact.split("-").pop();
+ var service = artifact.split("azure-resourcemanager-").pop();
if (!data[service]) {
data[service] = {};
}
@@ -208,8 +208,21 @@ function getSpecsMapping() {
const data = fs.readFileSync(api_specs_file, "utf-8");
let specs = { managedapplications: "resources" };
Object.entries(yaml.parse(data))
- .filter(([, service]) => service.hasOwnProperty("service"))
- .forEach(([rp, service]) => (specs[service["service"]] = rp));
+ .forEach(([rp, service]) => {
+ // e.g.
+ // web: (rp)
+ // service: appservice (service["service"])
+ // suffix: generated (service["suffix"])
+ let serviceName = rp
+ if (service.hasOwnProperty("service")) {
+ serviceName = service["service"]
+ }
+ if (service.hasOwnProperty("suffix")) {
+ serviceName = serviceName + "-" + service["suffix"];
+ }
+ console.log(serviceName)
+ specs[serviceName] = rp;
+ });
return specs;
}
diff --git a/sdk/resourcemanager/azure-resourcemanager-containerregistry/src/main/java/com/azure/resourcemanager/containerregistry/models/Registry.java b/sdk/resourcemanager/azure-resourcemanager-containerregistry/src/main/java/com/azure/resourcemanager/containerregistry/models/Registry.java
index 8daa0ab9a11b3..c60a962bb3355 100644
--- a/sdk/resourcemanager/azure-resourcemanager-containerregistry/src/main/java/com/azure/resourcemanager/containerregistry/models/Registry.java
+++ b/sdk/resourcemanager/azure-resourcemanager-containerregistry/src/main/java/com/azure/resourcemanager/containerregistry/models/Registry.java
@@ -103,7 +103,7 @@ public interface Registry
/** @return the network rule set for the container registry */
NetworkRuleSet networkRuleSet();
- /** @return whether the container registries dedicated data points can be accessed from public network */
+ /** @return whether the container registries dedicated data endpoints can be accessed from public network */
boolean isDedicatedDataEndpointsEnabled();
/** @return list of host names that will serve data when isDedicatedDataEndpointsEnabled is true */
@@ -225,11 +225,11 @@ interface WithPublicNetworkAccess {
}
/**
- * The stage of the container registry definition allowing to configure dedicated data points.
+ * The stage of the container registry definition allowing to configure dedicated data endpoints.
*/
interface WithDedicatedDataEndpoints {
/**
- * Enables dedicated data points for the container registry.
+ * Enables dedicated data endpoints for the container registry.
*
* @return the next stage of the definition
* @see
@@ -420,11 +420,11 @@ interface WithPublicNetworkAccess {
}
/**
- * The stage of the container registry definition allowing to configure dedicated data points.
+ * The stage of the container registry definition allowing to configure dedicated data endpoints.
*/
interface WithDedicatedDataEndpoints {
/**
- * Enables dedicated data points for the container registry.
+ * Enables dedicated data endpoints for the container registry.
*
* @return the next stage of the definition
* @see
@@ -434,7 +434,7 @@ interface WithDedicatedDataEndpoints {
Update enableDedicatedDataEndpoints();
/**
- * Disables dedicated data points for the container registry.
+ * Disables dedicated data endpoints for the container registry.
*
* @return the next stage of the definition
*/