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

Jump to bottom

[AutoPR containerregistry/resource-manager] allow specifying credentials for source registry on import image #2449

Merged
merged 2 commits into from
Oct 8, 2018
Merged

[AutoPR containerregistry/resource-manager] allow specifying credentials for source registry on import image #2449

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
13f2e52
Generated from 7d58dd0e73fb2740d7ebe8e534a973e959395d68
AutorestCI Oct 1, 2018
650b722
Generated from 7d58dd0e73fb2740d7ebe8e534a973e959395d68
AutorestCI Oct 8, 2018
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
6 changes: 3 additions & 3 deletions containerregistry/resource-manager/v2016_06_27_preview/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<packaging>jar</packaging>
<name>Microsoft Azure SDK for ContainerRegistry Management</name>
<description>This package contains Microsoft ContainerRegistry Management SDK.</description>
<url>https://github.com/Azure/azure-libraries-for-java</url>
<url>https://github.com/Azure/azure-sdk-for-java</url>
<licenses>
<license>
<name>The MIT License (MIT)</name>
Expand All @@ -28,8 +28,8 @@
</license>
</licenses>
<scm>
<url>scm:git:https://github.com/Azure/azure-libraries-for-java</url>
<connection>scm:git:git@github.com:Azure/azure-libraries-for-java.git</connection>
<url>scm:git:https://github.com/Azure/azure-sdk-for-java</url>
<connection>scm:git:git@github.com:Azure/azure-sdk-for-java.git</connection>
<tag>HEAD</tag>
</scm>
<properties>
Expand Down
16 changes: 12 additions & 4 deletions ...n/java/com/microsoft/azure/management/containerregistry/v2016_06_27_preview/Registry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,16 +73,20 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<Wit
interface WithStorageAccount {
/**
* Specifies storageAccount.
*/
* @param storageAccount The properties of the storage account for the container registry. If specified, the storage account must be in the same physical location as the container registry
* @return the next definition stage
*/
WithCreate withStorageAccount(StorageAccountProperties storageAccount);
}

/**
* The stage of the registry update allowing to specify AdminUserEnabled.
* The stage of the registry definition allowing to specify AdminUserEnabled.
*/
interface WithAdminUserEnabled {
/**
* Specifies adminUserEnabled.
* @param adminUserEnabled The value that indicates whether the admin user is enabled. This value is false by default
* @return the next definition stage
*/
WithCreate withAdminUserEnabled(Boolean adminUserEnabled);
}
Expand All @@ -106,21 +110,25 @@ interface Update extends Appliable<Registry>, Resource.UpdateWithTags<Update>, U
*/
interface UpdateStages {
/**
* The stage of the registry {0} allowing to specify AdminUserEnabled.
* The stage of the registry update allowing to specify AdminUserEnabled.
*/
interface WithAdminUserEnabled {
/**
* Specifies adminUserEnabled.
* @param adminUserEnabled The value that indicates whether the admin user is enabled. This value is false by default
* @return the next update stage
*/
Update withAdminUserEnabled(Boolean adminUserEnabled);
}

/**
* The stage of the registry {0} allowing to specify StorageAccount.
* The stage of the registry update allowing to specify StorageAccount.
*/
interface WithStorageAccount {
/**
* Specifies storageAccount.
* @param storageAccount The properties of a storage account for the container registry. If specified, the storage account must be in the same physical location as the container registry
* @return the next update stage
*/
Update withStorageAccount(StorageAccountProperties storageAccount);
}
Expand Down
20 changes: 10 additions & 10 deletions ...nerregistry/v2016_06_27_preview/implementation/ContainerRegistryManagementClientImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,11 @@ public String apiVersion() {
return this.apiVersion;
}

/** Gets or sets the preferred language for the response. */
/** The preferred language for the response. */
private String acceptLanguage;

/**
* Gets Gets or sets the preferred language for the response.
* Gets The preferred language for the response.
*
* @return the acceptLanguage value.
*/
Expand All @@ -76,7 +76,7 @@ public String acceptLanguage() {
}

/**
* Sets Gets or sets the preferred language for the response.
* Sets The preferred language for the response.
*
* @param acceptLanguage the acceptLanguage value.
* @return the service client itself
Expand All @@ -86,11 +86,11 @@ public ContainerRegistryManagementClientImpl withAcceptLanguage(String acceptLan
return this;
}

/** Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30. */
/** The retry timeout in seconds for Long Running Operations. Default value is 30. */
private int longRunningOperationRetryTimeout;

/**
* Gets Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30.
* Gets The retry timeout in seconds for Long Running Operations. Default value is 30.
*
* @return the longRunningOperationRetryTimeout value.
*/
Expand All @@ -99,7 +99,7 @@ public int longRunningOperationRetryTimeout() {
}

/**
* Sets Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30.
* Sets The retry timeout in seconds for Long Running Operations. Default value is 30.
*
* @param longRunningOperationRetryTimeout the longRunningOperationRetryTimeout value.
* @return the service client itself
Expand All @@ -109,11 +109,11 @@ public ContainerRegistryManagementClientImpl withLongRunningOperationRetryTimeou
return this;
}

/** When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true. */
/** Whether a unique x-ms-client-request-id should be generated. When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true. */
private boolean generateClientRequestId;

/**
* Gets When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
* Gets Whether a unique x-ms-client-request-id should be generated. When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
*
* @return the generateClientRequestId value.
*/
Expand All @@ -122,7 +122,7 @@ public boolean generateClientRequestId() {
}

/**
* Sets When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
* Sets Whether a unique x-ms-client-request-id should be generated. When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
*
* @param generateClientRequestId the generateClientRequestId value.
* @return the service client itself
Expand Down Expand Up @@ -191,6 +191,6 @@ protected void initialize() {
*/
@Override
public String userAgent() {
return String.format("%s (%s, %s)", super.userAgent(), "ContainerRegistryManagementClient", "2016-06-27-preview");
return String.format("%s (%s, %s, auto-generated)", super.userAgent(), "ContainerRegistryManagementClient", "2016-06-27-preview");
}
}
6 changes: 3 additions & 3 deletions containerregistry/resource-manager/v2017_03_01/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<packaging>jar</packaging>
<name>Microsoft Azure SDK for ContainerRegistry Management</name>
<description>This package contains Microsoft ContainerRegistry Management SDK.</description>
<url>https://github.com/Azure/azure-libraries-for-java</url>
<url>https://github.com/Azure/azure-sdk-for-java</url>
<licenses>
<license>
<name>The MIT License (MIT)</name>
Expand All @@ -28,8 +28,8 @@
</license>
</licenses>
<scm>
<url>scm:git:https://github.com/Azure/azure-libraries-for-java</url>
<connection>scm:git:git@github.com:Azure/azure-libraries-for-java.git</connection>
<url>scm:git:https://github.com/Azure/azure-sdk-for-java</url>
<connection>scm:git:git@github.com:Azure/azure-sdk-for-java.git</connection>
<tag>HEAD</tag>
</scm>
<properties>
Expand Down
20 changes: 15 additions & 5 deletions .../src/main/java/com/microsoft/azure/management/containerregistry/v2017_03_01/Registry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,9 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<Wit
interface WithSku {
/**
* Specifies sku.
*/
* @param sku The SKU of the container registry
* @return the next definition stage
*/
WithStorageAccount withSku(Sku sku);
}

Expand All @@ -93,16 +95,20 @@ interface WithSku {
interface WithStorageAccount {
/**
* Specifies storageAccount.
*/
* @param storageAccount The parameters of a storage account for the container registry. If specified, the storage account must be in the same physical location as the container registry
* @return the next definition stage
*/
WithCreate withStorageAccount(StorageAccountParameters storageAccount);
}

/**
* The stage of the registry update allowing to specify AdminUserEnabled.
* The stage of the registry definition allowing to specify AdminUserEnabled.
*/
interface WithAdminUserEnabled {
/**
* Specifies adminUserEnabled.
* @param adminUserEnabled The value that indicates whether the admin user is enabled
* @return the next definition stage
*/
WithCreate withAdminUserEnabled(Boolean adminUserEnabled);
}
Expand All @@ -126,21 +132,25 @@ interface Update extends Appliable<Registry>, Resource.UpdateWithTags<Update>, U
*/
interface UpdateStages {
/**
* The stage of the registry {0} allowing to specify AdminUserEnabled.
* The stage of the registry update allowing to specify AdminUserEnabled.
*/
interface WithAdminUserEnabled {
/**
* Specifies adminUserEnabled.
* @param adminUserEnabled The value that indicates whether the admin user is enabled
* @return the next update stage
*/
Update withAdminUserEnabled(Boolean adminUserEnabled);
}

/**
* The stage of the registry {0} allowing to specify StorageAccount.
* The stage of the registry update allowing to specify StorageAccount.
*/
interface WithStorageAccount {
/**
* Specifies storageAccount.
* @param storageAccount The parameters of a storage account for the container registry. If specified, the storage account must be in the same physical location as the container registry
* @return the next update stage
*/
Update withStorageAccount(StorageAccountParameters storageAccount);
}
Expand Down
20 changes: 10 additions & 10 deletions ...t/containerregistry/v2017_03_01/implementation/ContainerRegistryManagementClientImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,11 @@ public String apiVersion() {
return this.apiVersion;
}

/** Gets or sets the preferred language for the response. */
/** The preferred language for the response. */
private String acceptLanguage;

/**
* Gets Gets or sets the preferred language for the response.
* Gets The preferred language for the response.
*
* @return the acceptLanguage value.
*/
Expand All @@ -76,7 +76,7 @@ public String acceptLanguage() {
}

/**
* Sets Gets or sets the preferred language for the response.
* Sets The preferred language for the response.
*
* @param acceptLanguage the acceptLanguage value.
* @return the service client itself
Expand All @@ -86,11 +86,11 @@ public ContainerRegistryManagementClientImpl withAcceptLanguage(String acceptLan
return this;
}

/** Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30. */
/** The retry timeout in seconds for Long Running Operations. Default value is 30. */
private int longRunningOperationRetryTimeout;

/**
* Gets Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30.
* Gets The retry timeout in seconds for Long Running Operations. Default value is 30.
*
* @return the longRunningOperationRetryTimeout value.
*/
Expand All @@ -99,7 +99,7 @@ public int longRunningOperationRetryTimeout() {
}

/**
* Sets Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30.
* Sets The retry timeout in seconds for Long Running Operations. Default value is 30.
*
* @param longRunningOperationRetryTimeout the longRunningOperationRetryTimeout value.
* @return the service client itself
Expand All @@ -109,11 +109,11 @@ public ContainerRegistryManagementClientImpl withLongRunningOperationRetryTimeou
return this;
}

/** When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true. */
/** Whether a unique x-ms-client-request-id should be generated. When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true. */
private boolean generateClientRequestId;

/**
* Gets When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
* Gets Whether a unique x-ms-client-request-id should be generated. When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
*
* @return the generateClientRequestId value.
*/
Expand All @@ -122,7 +122,7 @@ public boolean generateClientRequestId() {
}

/**
* Sets When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
* Sets Whether a unique x-ms-client-request-id should be generated. When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
*
* @param generateClientRequestId the generateClientRequestId value.
* @return the service client itself
Expand Down Expand Up @@ -205,6 +205,6 @@ protected void initialize() {
*/
@Override
public String userAgent() {
return String.format("%s (%s, %s)", super.userAgent(), "ContainerRegistryManagementClient", "2017-03-01");
return String.format("%s (%s, %s, auto-generated)", super.userAgent(), "ContainerRegistryManagementClient", "2017-03-01");
}
}
6 changes: 3 additions & 3 deletions containerregistry/resource-manager/v2017_06_01_preview/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<packaging>jar</packaging>
<name>Microsoft Azure SDK for ContainerRegistry Management</name>
<description>This package contains Microsoft ContainerRegistry Management SDK.</description>
<url>https://github.com/Azure/azure-libraries-for-java</url>
<url>https://github.com/Azure/azure-sdk-for-java</url>
<licenses>
<license>
<name>The MIT License (MIT)</name>
Expand All @@ -28,8 +28,8 @@
</license>
</licenses>
<scm>
<url>scm:git:https://github.com/Azure/azure-libraries-for-java</url>
<connection>scm:git:git@github.com:Azure/azure-libraries-for-java.git</connection>
<url>scm:git:https://github.com/Azure/azure-sdk-for-java</url>
<connection>scm:git:git@github.com:Azure/azure-sdk-for-java.git</connection>
<tag>HEAD</tag>
</scm>
<properties>
Expand Down
Loading