Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mgmt, fix autocent, and acr docs #35153

Merged
merged 2 commits into from
May 25, 2023
Merged

mgmt, fix autocent, and acr docs #35153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17cdbda
fix acr dedicatedDataEndpoints javadocs
XiaofeiCao May 25, 2023
d16704c
fix autocent, with service suffix
XiaofeiCao May 25, 2023
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
19 changes: 16 additions & 3 deletions sdk/resourcemanager/autocent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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] = {};
}
Expand Down Expand Up @@ -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;
}

Expand Down
12 changes: 6 additions & 6 deletions ...erregistry/src/main/java/com/azure/resourcemanager/containerregistry/models/Registry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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 <a href="https://learn.microsoft.com/en-us/azure/container-registry/container-registry-firewall-access-rules#enable-dedicated-data-endpoints">
Expand Down Expand Up @@ -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 <a href="https://learn.microsoft.com/en-us/azure/container-registry/container-registry-firewall-access-rules#enable-dedicated-data-endpoints">
Expand All @@ -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
*/
Expand Down