[AutoPR containerservices/resource-manager] [AKS] remove "KeyVaultSecretRef" and rename to "ManagedClusterServicePrincipalProfile"

lib/services/containerservicesManagement/lib/models/index.d.ts

@@ -553,6 +553,22 @@ export interface TagsObject {
   tags?: { [propertyName: string]: string };
 }
 
+/**
+ * @class
+ * Initializes a new instance of the ManagedClusterServicePrincipalProfile class.
+ * @constructor
+ * Information about a service principal identity for the cluster to use for
+ * manipulating Azure APIs.
+ *
+ * @member {string} clientId The ID for the service principal.
+ * @member {string} [secret] The secret password associated with the service
+ * principal in plain text.
+ */
+export interface ManagedClusterServicePrincipalProfile {
+  clientId: string;
+  secret?: string;
+}
+
 /**
  * @class
  * Initializes a new instance of the ManagedClusterAgentPoolProfile class.
@@ -737,19 +753,10 @@ export interface ManagedClusterAADProfile {
  * used to authenticate with Linux-based VMs. Only expect one key specified.
  * @member {object} [servicePrincipalProfile] Information about a service
  * principal identity for the cluster to use for manipulating Azure APIs.
- * Either secret or keyVaultSecretRef must be specified.
  * @member {string} [servicePrincipalProfile.clientId] The ID for the service
  * principal.
  * @member {string} [servicePrincipalProfile.secret] The secret password
  * associated with the service principal in plain text.
- * @member {object} [servicePrincipalProfile.keyVaultSecretRef] Reference to a
- * secret stored in Azure Key Vault.
- * @member {string} [servicePrincipalProfile.keyVaultSecretRef.vaultID] Key
- * vault identifier.
- * @member {string} [servicePrincipalProfile.keyVaultSecretRef.secretName] The
- * secret name.
- * @member {string} [servicePrincipalProfile.keyVaultSecretRef.version] The
- * secret version.
  * @member {object} [addonProfiles] Profile of managed cluster add-on.
  * @member {string} [nodeResourceGroup] Name of the resource group containing
  * agent pool nodes.
@@ -788,7 +795,7 @@ export interface ManagedCluster extends Resource {
   readonly fqdn?: string;
   agentPoolProfiles?: ManagedClusterAgentPoolProfile[];
   linuxProfile?: ContainerServiceLinuxProfile;
-  servicePrincipalProfile?: ContainerServiceServicePrincipalProfile;
+  servicePrincipalProfile?: ManagedClusterServicePrincipalProfile;
   addonProfiles?: { [propertyName: string]: ManagedClusterAddonProfile };
   readonly nodeResourceGroup?: string;
   enableRBAC?: boolean;

lib/services/containerservicesManagement/lib/models/index.js

@@ -34,6 +34,7 @@ exports.ContainerServiceDiagnosticsProfile = require('./containerServiceDiagnost
 exports.ContainerService = require('./containerService');
 exports.OperationValue = require('./operationValue');
 exports.TagsObject = require('./tagsObject');
+exports.ManagedClusterServicePrincipalProfile = require('./managedClusterServicePrincipalProfile');
 exports.ManagedClusterAgentPoolProfile = require('./managedClusterAgentPoolProfile');
 exports.ContainerServiceNetworkProfile = require('./containerServiceNetworkProfile');
 exports.ManagedClusterAddonProfile = require('./managedClusterAddonProfile');

lib/services/containerservicesManagement/lib/models/managedCluster.js

@@ -38,19 +38,10 @@ class ManagedCluster extends models['Resource'] {
    * used to authenticate with Linux-based VMs. Only expect one key specified.
    * @member {object} [servicePrincipalProfile] Information about a service
    * principal identity for the cluster to use for manipulating Azure APIs.
-   * Either secret or keyVaultSecretRef must be specified.
    * @member {string} [servicePrincipalProfile.clientId] The ID for the service
    * principal.
    * @member {string} [servicePrincipalProfile.secret] The secret password
    * associated with the service principal in plain text.
-   * @member {object} [servicePrincipalProfile.keyVaultSecretRef] Reference to
-   * a secret stored in Azure Key Vault.
-   * @member {string} [servicePrincipalProfile.keyVaultSecretRef.vaultID] Key
-   * vault identifier.
-   * @member {string} [servicePrincipalProfile.keyVaultSecretRef.secretName]
-   * The secret name.
-   * @member {string} [servicePrincipalProfile.keyVaultSecretRef.version] The
-   * secret version.
    * @member {object} [addonProfiles] Profile of managed cluster add-on.
    * @member {string} [nodeResourceGroup] Name of the resource group containing
    * agent pool nodes.
@@ -203,7 +194,7 @@ class ManagedCluster extends models['Resource'] {
             serializedName: 'properties.servicePrincipalProfile',
             type: {
               name: 'Composite',
-              className: 'ContainerServiceServicePrincipalProfile'
+              className: 'ManagedClusterServicePrincipalProfile'
             }
           },
           addonProfiles: {

lib/services/containerservicesManagement/lib/models/managedClusterServicePrincipalProfile.js

@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
+ */
+
+'use strict';
+
+/**
+ * Information about a service principal identity for the cluster to use for
+ * manipulating Azure APIs.
+ *
+ */
+class ManagedClusterServicePrincipalProfile {
+  /**
+   * Create a ManagedClusterServicePrincipalProfile.
+   * @member {string} clientId The ID for the service principal.
+   * @member {string} [secret] The secret password associated with the service
+   * principal in plain text.
+   */
+  constructor() {
+  }
+
+  /**
+   * Defines the metadata of ManagedClusterServicePrincipalProfile
+   *
+   * @returns {object} metadata of ManagedClusterServicePrincipalProfile
+   *
+   */
+  mapper() {
+    return {
+      required: false,
+      serializedName: 'ManagedClusterServicePrincipalProfile',
+      type: {
+        name: 'Composite',
+        className: 'ManagedClusterServicePrincipalProfile',
+        modelProperties: {
+          clientId: {
+            required: true,
+            serializedName: 'clientId',
+            type: {
+              name: 'String'
+            }
+          },
+          secret: {
+            required: false,
+            serializedName: 'secret',
+            type: {
+              name: 'String'
+            }
+          }
+        }
+      }
+    };
+  }
+}
+
+module.exports = ManagedClusterServicePrincipalProfile;

lib/services/containerservicesManagement/lib/operations/index.d.ts

@@ -1772,28 +1772,14 @@ export interface ManagedClusters {
      *
      * @param {object} [parameters.servicePrincipalProfile] Information about a
      * service principal identity for the cluster to use for manipulating Azure
-     * APIs. Either secret or keyVaultSecretRef must be specified.
+     * APIs.
      *
      * @param {string} parameters.servicePrincipalProfile.clientId The ID for the
      * service principal.
      *
      * @param {string} [parameters.servicePrincipalProfile.secret] The secret
      * password associated with the service principal in plain text.
      *
-     * @param {object} [parameters.servicePrincipalProfile.keyVaultSecretRef]
-     * Reference to a secret stored in Azure Key Vault.
-     *
-     * @param {string} parameters.servicePrincipalProfile.keyVaultSecretRef.vaultID
-     * Key vault identifier.
-     *
-     * @param {string}
-     * parameters.servicePrincipalProfile.keyVaultSecretRef.secretName The secret
-     * name.
-     *
-     * @param {string}
-     * [parameters.servicePrincipalProfile.keyVaultSecretRef.version] The secret
-     * version.
-     *
      * @param {object} [parameters.addonProfiles] Profile of managed cluster
      * add-on.
      *
@@ -1894,28 +1880,14 @@ export interface ManagedClusters {
      *
      * @param {object} [parameters.servicePrincipalProfile] Information about a
      * service principal identity for the cluster to use for manipulating Azure
-     * APIs. Either secret or keyVaultSecretRef must be specified.
+     * APIs.
      *
      * @param {string} parameters.servicePrincipalProfile.clientId The ID for the
      * service principal.
      *
      * @param {string} [parameters.servicePrincipalProfile.secret] The secret
      * password associated with the service principal in plain text.
      *
-     * @param {object} [parameters.servicePrincipalProfile.keyVaultSecretRef]
-     * Reference to a secret stored in Azure Key Vault.
-     *
-     * @param {string} parameters.servicePrincipalProfile.keyVaultSecretRef.vaultID
-     * Key vault identifier.
-     *
-     * @param {string}
-     * parameters.servicePrincipalProfile.keyVaultSecretRef.secretName The secret
-     * name.
-     *
-     * @param {string}
-     * [parameters.servicePrincipalProfile.keyVaultSecretRef.version] The secret
-     * version.
-     *
      * @param {object} [parameters.addonProfiles] Profile of managed cluster
      * add-on.
      *
@@ -2170,28 +2142,14 @@ export interface ManagedClusters {
      *
      * @param {object} [parameters.servicePrincipalProfile] Information about a
      * service principal identity for the cluster to use for manipulating Azure
-     * APIs. Either secret or keyVaultSecretRef must be specified.
+     * APIs.
      *
      * @param {string} parameters.servicePrincipalProfile.clientId The ID for the
      * service principal.
      *
      * @param {string} [parameters.servicePrincipalProfile.secret] The secret
      * password associated with the service principal in plain text.
      *
-     * @param {object} [parameters.servicePrincipalProfile.keyVaultSecretRef]
-     * Reference to a secret stored in Azure Key Vault.
-     *
-     * @param {string} parameters.servicePrincipalProfile.keyVaultSecretRef.vaultID
-     * Key vault identifier.
-     *
-     * @param {string}
-     * parameters.servicePrincipalProfile.keyVaultSecretRef.secretName The secret
-     * name.
-     *
-     * @param {string}
-     * [parameters.servicePrincipalProfile.keyVaultSecretRef.version] The secret
-     * version.
-     *
      * @param {object} [parameters.addonProfiles] Profile of managed cluster
      * add-on.
      *
@@ -2292,28 +2250,14 @@ export interface ManagedClusters {
      *
      * @param {object} [parameters.servicePrincipalProfile] Information about a
      * service principal identity for the cluster to use for manipulating Azure
-     * APIs. Either secret or keyVaultSecretRef must be specified.
+     * APIs.
      *
      * @param {string} parameters.servicePrincipalProfile.clientId The ID for the
      * service principal.
      *
      * @param {string} [parameters.servicePrincipalProfile.secret] The secret
      * password associated with the service principal in plain text.
      *
-     * @param {object} [parameters.servicePrincipalProfile.keyVaultSecretRef]
-     * Reference to a secret stored in Azure Key Vault.
-     *
-     * @param {string} parameters.servicePrincipalProfile.keyVaultSecretRef.vaultID
-     * Key vault identifier.
-     *
-     * @param {string}
-     * parameters.servicePrincipalProfile.keyVaultSecretRef.secretName The secret
-     * name.
-     *
-     * @param {string}
-     * [parameters.servicePrincipalProfile.keyVaultSecretRef.version] The secret
-     * version.
-     *
      * @param {object} [parameters.addonProfiles] Profile of managed cluster
      * add-on.
      *