diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 61cec91a5106..53950d26fd07 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -3928,7 +3928,7 @@ packages: dependencies: semver: 7.3.8 shelljs: 0.8.5 - typescript: 5.0.0-dev.20230210 + typescript: 5.0.0-dev.20230212 dev: false /downlevel-dts/0.7.0: @@ -8712,8 +8712,8 @@ packages: hasBin: true dev: false - /typescript/5.0.0-dev.20230210: - resolution: {integrity: sha512-FjXPw8PFeIuT1cxouvP4LRu8J1G+FsWVEGwlJ9GcVywRNDfD3Hh6flQFUympS+3QnAIiG/+CHs9ZS2EQIT733g==} + /typescript/5.0.0-dev.20230212: + resolution: {integrity: sha512-efEcegARgRwbXNd6AqZXsitNHVZMEGFxiYFi/OBbWvoI0d/ynmUfSbkBYRZ7L5iSFEbSwIt/Git9go43vefUCQ==} engines: {node: '>=4.2.0'} hasBin: true dev: false @@ -12550,15 +12550,15 @@ packages: dev: false file:projects/arm-kubernetesconfiguration.tgz: - resolution: {integrity: sha512-XSZ208TxsTcY7610iIeS9riodxQR/Mt832rbKY0crvEygunKhR+oH8eMtci1VsYZGJSWcQH8823eE7wpMB91zw==, tarball: file:projects/arm-kubernetesconfiguration.tgz} + resolution: {integrity: sha512-VOzTmZdlOu5d7rlJqIgRBzyVmelErE5bYOXKAjAD+rwUGvxpzK5I7auFtmPfyb7b25tBK87phc+USDKd/i8oIQ==, tarball: file:projects/arm-kubernetesconfiguration.tgz} name: '@rush-temp/arm-kubernetesconfiguration' version: 0.0.0 dependencies: '@azure/identity': 2.1.0 '@microsoft/api-extractor': 7.34.3_@types+node@14.18.36 - '@rollup/plugin-commonjs': 24.0.1_rollup@2.79.1 - '@rollup/plugin-json': 6.0.0_rollup@2.79.1 - '@rollup/plugin-multi-entry': 6.0.0_rollup@2.79.1 + '@rollup/plugin-commonjs': 21.1.0_rollup@2.79.1 + '@rollup/plugin-json': 4.1.0_rollup@2.79.1 + '@rollup/plugin-multi-entry': 4.1.0_rollup@2.79.1 '@rollup/plugin-node-resolve': 13.3.0_rollup@2.79.1 '@types/chai': 4.3.4 '@types/node': 14.18.36 diff --git a/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/CHANGELOG.md b/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/CHANGELOG.md index 3d6581fe78a4..59020289a0a0 100644 --- a/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/CHANGELOG.md +++ b/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/CHANGELOG.md @@ -1,15 +1,28 @@ # Release History + +## 6.0.0 (2023-02-13) + +**Features** -## 5.1.1 (Unreleased) - -### Features Added - -### Breaking Changes - -### Bugs Fixed - -### Other Changes - + - Added Interface AzureBlobDefinition + - Added Interface AzureBlobPatchDefinition + - Added Interface ManagedIdentityDefinition + - Added Interface ManagedIdentityPatchDefinition + - Added Interface Plan + - Added Interface ServicePrincipalDefinition + - Added Interface ServicePrincipalPatchDefinition + - Interface Extension has a new optional parameter currentVersion + - Interface Extension has a new optional parameter isSystemExtension + - Interface Extension has a new optional parameter plan + - Interface FluxConfiguration has a new optional parameter azureBlob + - Interface FluxConfigurationPatch has a new optional parameter azureBlob + - Enum KnownSourceKindType has a new value AzureBlob + +**Breaking Changes** + + - Interface Extension no longer has parameter installedVersion + + ## 5.1.0 (2022-11-28) **Features** diff --git a/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/LICENSE b/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/LICENSE index 5d1d36e0af80..3a1d9b6f24f7 100644 --- a/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/LICENSE +++ b/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2022 Microsoft +Copyright (c) 2023 Microsoft Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/_meta.json b/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/_meta.json index 19e0b9ac7ba8..d80b04218907 100644 --- a/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/_meta.json +++ b/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/_meta.json @@ -1,8 +1,8 @@ { - "commit": "1fefe3f5cee88319b17c08a2dbf95e1e983a9f8c", + "commit": "f4175eea8958c500483d499acccfb90b12dfebf8", "readme": "specification/kubernetesconfiguration/resource-manager/readme.md", - "autorest_command": "autorest --version=3.8.4 --typescript --modelerfour.lenient-model-deduplication --azure-arm --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=D:\\Git\\azure-sdk-for-js ..\\azure-rest-api-specs\\specification\\kubernetesconfiguration\\resource-manager\\readme.md --use=@autorest/typescript@6.0.0-rc.3.20221108.1 --generate-sample=true", + "autorest_command": "autorest --version=3.9.3 --typescript --modelerfour.lenient-model-deduplication --azure-arm --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=/mnt/vss/_work/1/s/azure-sdk-for-js ../azure-rest-api-specs/specification/kubernetesconfiguration/resource-manager/readme.md --use=@autorest/typescript@6.0.0-rc.5", "repository_url": "https://github.com/Azure/azure-rest-api-specs.git", - "release_tool": "@azure-tools/js-sdk-release-tools@2.4.2", - "use": "@autorest/typescript@6.0.0-rc.3.20221108.1" + "release_tool": "@azure-tools/js-sdk-release-tools@2.6.2", + "use": "@autorest/typescript@6.0.0-rc.5" } \ No newline at end of file diff --git a/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/package.json b/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/package.json index 55c8c8476ae4..6b951face3fe 100644 --- a/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/package.json +++ b/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/package.json @@ -3,7 +3,7 @@ "sdk-type": "mgmt", "author": "Microsoft Corporation", "description": "A generated SDK for SourceControlConfigurationClient.", - "version": "5.1.1", + "version": "6.0.0", "engines": { "node": ">=14.0.0" }, @@ -29,9 +29,9 @@ "types": "./types/arm-kubernetesconfiguration.d.ts", "devDependencies": { "@microsoft/api-extractor": "^7.31.1", - "@rollup/plugin-commonjs": "^24.0.0", - "@rollup/plugin-json": "^6.0.0", - "@rollup/plugin-multi-entry": "^6.0.0", + "@rollup/plugin-commonjs": "^21.0.1", + "@rollup/plugin-json": "^4.1.0", + "@rollup/plugin-multi-entry": "^4.1.0", "@rollup/plugin-node-resolve": "^13.1.3", "mkdirp": "^1.0.4", "rollup": "^2.66.1", @@ -110,13 +110,5 @@ } ] }, - "autoPublish": true, - "//sampleConfiguration": { - "productName": "", - "productSlugs": [ - "azure" - ], - "disableDocsMs": true, - "apiRefLink": "https://docs.microsoft.com/javascript/api/@azure/arm-kubernetesconfiguration?view=azure-node-preview" - } -} + "autoPublish": true +} \ No newline at end of file diff --git a/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/review/arm-kubernetesconfiguration.api.md b/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/review/arm-kubernetesconfiguration.api.md index 24f00c7a9280..043f047eb02f 100644 --- a/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/review/arm-kubernetesconfiguration.api.md +++ b/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/review/arm-kubernetesconfiguration.api.md @@ -13,6 +13,32 @@ import { PollOperationState } from '@azure/core-lro'; // @public export type AKSIdentityType = "SystemAssigned" | "UserAssigned"; +// @public +export interface AzureBlobDefinition { + accountKey?: string; + containerName?: string; + localAuthRef?: string; + managedIdentity?: ManagedIdentityDefinition; + sasToken?: string; + servicePrincipal?: ServicePrincipalDefinition; + syncIntervalInSeconds?: number; + timeoutInSeconds?: number; + url?: string; +} + +// @public +export interface AzureBlobPatchDefinition { + accountKey?: string; + containerName?: string; + localAuthRef?: string; + managedIdentity?: ManagedIdentityPatchDefinition; + sasToken?: string; + servicePrincipal?: ServicePrincipalPatchDefinition; + syncIntervalInSeconds?: number; + timeoutInSeconds?: number; + url?: string; +} + // @public export interface BucketDefinition { accessKey?: string; @@ -79,14 +105,16 @@ export interface Extension extends ProxyResource { configurationSettings?: { [propertyName: string]: string; }; + readonly currentVersion?: string; readonly customLocationSettings?: { [propertyName: string]: string; }; readonly errorInfo?: ErrorDetail; extensionType?: string; identity?: Identity; - readonly installedVersion?: string; + readonly isSystemExtension?: boolean; readonly packageUri?: string; + plan?: Plan; readonly provisioningState?: ProvisioningState; releaseTrain?: string; scope?: Scope; @@ -192,6 +220,7 @@ export type FluxConfigOperationStatusGetResponse = OperationStatusResult; // @public export interface FluxConfiguration extends ProxyResource { + azureBlob?: AzureBlobDefinition; bucket?: BucketDefinition; readonly complianceState?: FluxComplianceState; configurationProtectedSettings?: { @@ -217,6 +246,7 @@ export interface FluxConfiguration extends ProxyResource { // @public export interface FluxConfigurationPatch { + azureBlob?: AzureBlobPatchDefinition; bucket?: BucketPatchDefinition; configurationProtectedSettings?: { [propertyName: string]: string; @@ -427,6 +457,7 @@ export enum KnownScopeType { // @public export enum KnownSourceKindType { + AzureBlob = "AzureBlob", Bucket = "Bucket", GitRepository = "GitRepository" } @@ -460,6 +491,16 @@ export type KustomizationValidationType = string; // @public export type LevelType = string; +// @public +export interface ManagedIdentityDefinition { + clientId?: string; +} + +// @public +export interface ManagedIdentityPatchDefinition { + clientId?: string; +} + // @public export type MessageLevelType = string; @@ -571,6 +612,15 @@ export interface PatchExtension { version?: string; } +// @public +export interface Plan { + name: string; + product: string; + promotionCode?: string; + publisher: string; + version?: string; +} + // @public export type ProvisioningState = string; @@ -637,6 +687,26 @@ export interface ScopeNamespace { // @public export type ScopeType = string; +// @public +export interface ServicePrincipalDefinition { + clientCertificate?: string; + clientCertificatePassword?: string; + clientCertificateSendChain?: boolean; + clientId?: string; + clientSecret?: string; + tenantId?: string; +} + +// @public +export interface ServicePrincipalPatchDefinition { + clientCertificate?: string; + clientCertificatePassword?: string; + clientCertificateSendChain?: boolean; + clientId?: string; + clientSecret?: string; + tenantId?: string; +} + // @public export interface SourceControlConfiguration extends ProxyResource { readonly complianceStatus?: ComplianceStatus; diff --git a/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/src/models/index.ts b/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/src/models/index.ts index 9929ef48fed3..0e5802dc3dcb 100644 --- a/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/src/models/index.ts +++ b/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/src/models/index.ts @@ -133,6 +133,20 @@ export interface SystemData { lastModifiedAt?: Date; } +/** Plan for the resource. */ +export interface Plan { + /** A user defined name of the 3rd Party Artifact that is being procured. */ + name: string; + /** The publisher of the 3rd Party Artifact that is being bought. E.g. NewRelic */ + publisher: string; + /** The 3rd Party artifact that is being procured. E.g. NewRelic. Product maps to the OfferID specified for the artifact at the time of Data Market onboarding. */ + product: string; + /** A publisher provided promotion code as provisioned in Data Market for the said product/artifact. */ + promotionCode?: string; + /** The version of the desired product/artifact. */ + version?: string; +} + /** Common fields that are returned in the response for all Azure Resource Manager resources */ export interface Resource { /** @@ -235,7 +249,7 @@ export interface RepositoryRefDefinition { commit?: string; } -/** Parameters to reconcile to the GitRepository source kind type. */ +/** Parameters to reconcile to the Bucket source kind type. */ export interface BucketDefinition { /** The URL to sync for the flux configuration S3 bucket. */ url?: string; @@ -243,9 +257,9 @@ export interface BucketDefinition { bucketName?: string; /** Specify whether to use insecure communication when puling data from the S3 bucket. */ insecure?: boolean; - /** The maximum time to attempt to reconcile the cluster git repository source with the remote. */ + /** The maximum time to attempt to reconcile the cluster bucket source with the remote. */ timeoutInSeconds?: number; - /** The interval at which to re-reconcile the cluster git repository source with the remote. */ + /** The interval at which to re-reconcile the cluster bucket source with the remote. */ syncIntervalInSeconds?: number; /** Plaintext access key used to securely access the S3 bucket */ accessKey?: string; @@ -253,6 +267,50 @@ export interface BucketDefinition { localAuthRef?: string; } +/** Parameters to reconcile to the AzureBlob source kind type. */ +export interface AzureBlobDefinition { + /** The URL to sync for the flux configuration Azure Blob storage account. */ + url?: string; + /** The Azure Blob container name to sync from the url endpoint for the flux configuration. */ + containerName?: string; + /** The maximum time to attempt to reconcile the cluster Azure Blob source with the remote. */ + timeoutInSeconds?: number; + /** The interval at which to re-reconcile the cluster Azure Blob source with the remote. */ + syncIntervalInSeconds?: number; + /** Parameters to authenticate using Service Principal. */ + servicePrincipal?: ServicePrincipalDefinition; + /** The account key (shared key) to access the storage account */ + accountKey?: string; + /** The Shared Access token to access the storage container */ + sasToken?: string; + /** Parameters to authenticate using a Managed Identity. */ + managedIdentity?: ManagedIdentityDefinition; + /** Name of a local secret on the Kubernetes cluster to use as the authentication secret rather than the managed or user-provided configuration secrets. */ + localAuthRef?: string; +} + +/** Parameters to authenticate using Service Principal. */ +export interface ServicePrincipalDefinition { + /** The client Id for authenticating a Service Principal. */ + clientId?: string; + /** The tenant Id for authenticating a Service Principal */ + tenantId?: string; + /** The client secret for authenticating a Service Principal */ + clientSecret?: string; + /** Base64-encoded certificate used to authenticate a Service Principal */ + clientCertificate?: string; + /** The password for the certificate used to authenticate a Service Principal */ + clientCertificatePassword?: string; + /** Specifies whether to include x5c header in client claims when acquiring a token to enable subject name / issuer based authentication for the Client Certificate */ + clientCertificateSendChain?: boolean; +} + +/** Parameters to authenticate using a Managed Identity. */ +export interface ManagedIdentityDefinition { + /** The client Id for authenticating a Managed Identity. */ + clientId?: string; +} + /** The Kustomization defining how to reconcile the artifact pulled by the source type on the cluster. */ export interface KustomizationDefinition { /** @@ -340,6 +398,8 @@ export interface FluxConfigurationPatch { gitRepository?: GitRepositoryPatchDefinition; /** Parameters to reconcile to the Bucket source kind type. */ bucket?: BucketPatchDefinition; + /** Parameters to reconcile to the AzureBlob source kind type. */ + azureBlob?: AzureBlobPatchDefinition; /** Array of kustomizations used to reconcile the artifact pulled by the source type on the cluster. */ kustomizations?: { [propertyName: string]: KustomizationPatchDefinition | null; @@ -368,7 +428,7 @@ export interface GitRepositoryPatchDefinition { localAuthRef?: string; } -/** Parameters to reconcile to the GitRepository source kind type. */ +/** Parameters to reconcile to the Bucket source kind type. */ export interface BucketPatchDefinition { /** The URL to sync for the flux configuration S3 bucket. */ url?: string; @@ -376,9 +436,9 @@ export interface BucketPatchDefinition { bucketName?: string; /** Specify whether to use insecure communication when puling data from the S3 bucket. */ insecure?: boolean; - /** The maximum time to attempt to reconcile the cluster git repository source with the remote. */ + /** The maximum time to attempt to reconcile the cluster bucket source with the remote. */ timeoutInSeconds?: number; - /** The interval at which to re-reconcile the cluster git repository source with the remote. */ + /** The interval at which to re-reconcile the cluster bucket source with the remote. */ syncIntervalInSeconds?: number; /** Plaintext access key used to securely access the S3 bucket */ accessKey?: string; @@ -386,6 +446,50 @@ export interface BucketPatchDefinition { localAuthRef?: string; } +/** Parameters to reconcile to the AzureBlob source kind type. */ +export interface AzureBlobPatchDefinition { + /** The URL to sync for the flux configuration Azure Blob storage account. */ + url?: string; + /** The Azure Blob container name to sync from the url endpoint for the flux configuration. */ + containerName?: string; + /** The maximum time to attempt to reconcile the cluster Azure Blob source with the remote. */ + timeoutInSeconds?: number; + /** The interval at which to re-reconcile the cluster Azure Blob source with the remote. */ + syncIntervalInSeconds?: number; + /** Parameters to authenticate using Service Principal. */ + servicePrincipal?: ServicePrincipalPatchDefinition; + /** The account key (shared key) to access the storage account */ + accountKey?: string; + /** The Shared Access token to access the storage container */ + sasToken?: string; + /** Parameters to authenticate using a Managed Identity. */ + managedIdentity?: ManagedIdentityPatchDefinition; + /** Name of a local secret on the Kubernetes cluster to use as the authentication secret rather than the managed or user-provided configuration secrets. */ + localAuthRef?: string; +} + +/** Parameters to authenticate using Service Principal. */ +export interface ServicePrincipalPatchDefinition { + /** The client Id for authenticating a Service Principal. */ + clientId?: string; + /** The tenant Id for authenticating a Service Principal */ + tenantId?: string; + /** The client secret for authenticating a Service Principal */ + clientSecret?: string; + /** Base64-encoded certificate used to authenticate a Service Principal */ + clientCertificate?: string; + /** The password for the certificate used to authenticate a Service Principal */ + clientCertificatePassword?: string; + /** Specifies whether to include x5c header in client claims when acquiring a token to enable subject name / issuer based authentication for the Client Certificate */ + clientCertificateSendChain?: boolean; +} + +/** Parameters to authenticate using a Managed Identity. */ +export interface ManagedIdentityPatchDefinition { + /** The client Id for authenticating a Managed Identity. */ + clientId?: string; +} + /** The Kustomization defining how to reconcile the artifact pulled by the source type on the cluster. */ export interface KustomizationPatchDefinition { /** The path in the source reference to reconcile on the cluster. */ @@ -522,6 +626,8 @@ export interface Extension extends ProxyResource { * NOTE: This property will not be serialized. It can only be populated by the server. */ readonly systemData?: SystemData; + /** The plan information. */ + plan?: Plan; /** Type of the Extension, of which this resource is an instance of. It must be one of the Extension Types registered with Microsoft.KubernetesConfiguration by the Extension publisher. */ extensionType?: string; /** Flag to note if this extension participates in auto upgrade of minor version, or not. */ @@ -537,10 +643,10 @@ export interface Extension extends ProxyResource { /** Configuration settings that are sensitive, as name-value pairs for configuring this extension. */ configurationProtectedSettings?: { [propertyName: string]: string }; /** - * Installed version of the extension. + * Currently installed version of the extension. * NOTE: This property will not be serialized. It can only be populated by the server. */ - readonly installedVersion?: string; + readonly currentVersion?: string; /** * Status of installation of this extension. * NOTE: This property will not be serialized. It can only be populated by the server. @@ -565,6 +671,11 @@ export interface Extension extends ProxyResource { readonly packageUri?: string; /** Identity of the Extension resource in an AKS cluster */ aksAssignedIdentity?: ExtensionPropertiesAksAssignedIdentity; + /** + * Flag to note if this extension is a system extension + * NOTE: This property will not be serialized. It can only be populated by the server. + */ + readonly isSystemExtension?: boolean; } /** The Flux Configuration object returned in Get & Put response. */ @@ -586,6 +697,8 @@ export interface FluxConfiguration extends ProxyResource { gitRepository?: GitRepositoryDefinition; /** Parameters to reconcile to the Bucket source kind type. */ bucket?: BucketDefinition; + /** Parameters to reconcile to the AzureBlob source kind type. */ + azureBlob?: AzureBlobDefinition; /** Array of kustomizations used to reconcile the artifact pulled by the source type on the cluster. */ kustomizations?: { [propertyName: string]: KustomizationDefinition | null }; /** Key-value pairs of protected configuration settings for the configuration */ @@ -774,7 +887,9 @@ export enum KnownSourceKindType { /** GitRepository */ GitRepository = "GitRepository", /** Bucket */ - Bucket = "Bucket" + Bucket = "Bucket", + /** AzureBlob */ + AzureBlob = "AzureBlob" } /** @@ -783,7 +898,8 @@ export enum KnownSourceKindType { * this enum contains the known values that the service supports. * ### Known values supported by the service * **GitRepository** \ - * **Bucket** + * **Bucket** \ + * **AzureBlob** */ export type SourceKindType = string; diff --git a/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/src/models/mappers.ts b/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/src/models/mappers.ts index e3e49d8796b4..b43824e71936 100644 --- a/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/src/models/mappers.ts +++ b/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/src/models/mappers.ts @@ -287,6 +287,48 @@ export const SystemData: coreClient.CompositeMapper = { } }; +export const Plan: coreClient.CompositeMapper = { + type: { + name: "Composite", + className: "Plan", + modelProperties: { + name: { + serializedName: "name", + required: true, + type: { + name: "String" + } + }, + publisher: { + serializedName: "publisher", + required: true, + type: { + name: "String" + } + }, + product: { + serializedName: "product", + required: true, + type: { + name: "String" + } + }, + promotionCode: { + serializedName: "promotionCode", + type: { + name: "String" + } + }, + version: { + serializedName: "version", + type: { + name: "String" + } + } + } + } +}; + export const Resource: coreClient.CompositeMapper = { type: { name: "Composite", @@ -613,6 +655,147 @@ export const BucketDefinition: coreClient.CompositeMapper = { } }; +export const AzureBlobDefinition: coreClient.CompositeMapper = { + type: { + name: "Composite", + className: "AzureBlobDefinition", + modelProperties: { + url: { + serializedName: "url", + nullable: true, + type: { + name: "String" + } + }, + containerName: { + serializedName: "containerName", + nullable: true, + type: { + name: "String" + } + }, + timeoutInSeconds: { + defaultValue: 600, + serializedName: "timeoutInSeconds", + nullable: true, + type: { + name: "Number" + } + }, + syncIntervalInSeconds: { + defaultValue: 600, + serializedName: "syncIntervalInSeconds", + nullable: true, + type: { + name: "Number" + } + }, + servicePrincipal: { + serializedName: "servicePrincipal", + type: { + name: "Composite", + className: "ServicePrincipalDefinition" + } + }, + accountKey: { + serializedName: "accountKey", + nullable: true, + type: { + name: "String" + } + }, + sasToken: { + serializedName: "sasToken", + nullable: true, + type: { + name: "String" + } + }, + managedIdentity: { + serializedName: "managedIdentity", + type: { + name: "Composite", + className: "ManagedIdentityDefinition" + } + }, + localAuthRef: { + serializedName: "localAuthRef", + nullable: true, + type: { + name: "String" + } + } + } + } +}; + +export const ServicePrincipalDefinition: coreClient.CompositeMapper = { + type: { + name: "Composite", + className: "ServicePrincipalDefinition", + modelProperties: { + clientId: { + serializedName: "clientId", + nullable: true, + type: { + name: "String" + } + }, + tenantId: { + serializedName: "tenantId", + nullable: true, + type: { + name: "String" + } + }, + clientSecret: { + serializedName: "clientSecret", + nullable: true, + type: { + name: "String" + } + }, + clientCertificate: { + serializedName: "clientCertificate", + nullable: true, + type: { + name: "String" + } + }, + clientCertificatePassword: { + serializedName: "clientCertificatePassword", + nullable: true, + type: { + name: "String" + } + }, + clientCertificateSendChain: { + defaultValue: false, + serializedName: "clientCertificateSendChain", + type: { + name: "Boolean" + } + } + } + } +}; + +export const ManagedIdentityDefinition: coreClient.CompositeMapper = { + type: { + name: "Composite", + className: "ManagedIdentityDefinition", + modelProperties: { + clientId: { + serializedName: "clientId", + nullable: true, + type: { + name: "String" + } + } + } + } +}; + export const KustomizationDefinition: coreClient.CompositeMapper = { type: { name: "Composite", @@ -883,6 +1066,13 @@ export const FluxConfigurationPatch: coreClient.CompositeMapper = { className: "BucketPatchDefinition" } }, + azureBlob: { + serializedName: "properties.azureBlob", + type: { + name: "Composite", + className: "AzureBlobPatchDefinition" + } + }, kustomizations: { serializedName: "properties.kustomizations", nullable: true, @@ -1031,6 +1221,144 @@ export const BucketPatchDefinition: coreClient.CompositeMapper = { } }; +export const AzureBlobPatchDefinition: coreClient.CompositeMapper = { + type: { + name: "Composite", + className: "AzureBlobPatchDefinition", + modelProperties: { + url: { + serializedName: "url", + nullable: true, + type: { + name: "String" + } + }, + containerName: { + serializedName: "containerName", + nullable: true, + type: { + name: "String" + } + }, + timeoutInSeconds: { + serializedName: "timeoutInSeconds", + nullable: true, + type: { + name: "Number" + } + }, + syncIntervalInSeconds: { + serializedName: "syncIntervalInSeconds", + nullable: true, + type: { + name: "Number" + } + }, + servicePrincipal: { + serializedName: "servicePrincipal", + type: { + name: "Composite", + className: "ServicePrincipalPatchDefinition" + } + }, + accountKey: { + serializedName: "accountKey", + nullable: true, + type: { + name: "String" + } + }, + sasToken: { + serializedName: "sasToken", + nullable: true, + type: { + name: "String" + } + }, + managedIdentity: { + serializedName: "managedIdentity", + type: { + name: "Composite", + className: "ManagedIdentityPatchDefinition" + } + }, + localAuthRef: { + serializedName: "localAuthRef", + nullable: true, + type: { + name: "String" + } + } + } + } +}; + +export const ServicePrincipalPatchDefinition: coreClient.CompositeMapper = { + type: { + name: "Composite", + className: "ServicePrincipalPatchDefinition", + modelProperties: { + clientId: { + serializedName: "clientId", + nullable: true, + type: { + name: "String" + } + }, + tenantId: { + serializedName: "tenantId", + nullable: true, + type: { + name: "String" + } + }, + clientSecret: { + serializedName: "clientSecret", + nullable: true, + type: { + name: "String" + } + }, + clientCertificate: { + serializedName: "clientCertificate", + nullable: true, + type: { + name: "String" + } + }, + clientCertificatePassword: { + serializedName: "clientCertificatePassword", + nullable: true, + type: { + name: "String" + } + }, + clientCertificateSendChain: { + serializedName: "clientCertificateSendChain", + type: { + name: "Boolean" + } + } + } + } +}; + +export const ManagedIdentityPatchDefinition: coreClient.CompositeMapper = { + type: { + name: "Composite", + className: "ManagedIdentityPatchDefinition", + modelProperties: { + clientId: { + serializedName: "clientId", + nullable: true, + type: { + name: "String" + } + } + } + } +}; + export const KustomizationPatchDefinition: coreClient.CompositeMapper = { type: { name: "Composite", @@ -1363,6 +1691,13 @@ export const Extension: coreClient.CompositeMapper = { className: "SystemData" } }, + plan: { + serializedName: "plan", + type: { + name: "Composite", + className: "Plan" + } + }, extensionType: { serializedName: "properties.extensionType", type: { @@ -1413,8 +1748,8 @@ export const Extension: coreClient.CompositeMapper = { value: { type: { name: "String" } } } }, - installedVersion: { - serializedName: "properties.installedVersion", + currentVersion: { + serializedName: "properties.currentVersion", readOnly: true, nullable: true, type: { @@ -1471,6 +1806,14 @@ export const Extension: coreClient.CompositeMapper = { name: "Composite", className: "ExtensionPropertiesAksAssignedIdentity" } + }, + isSystemExtension: { + defaultValue: false, + serializedName: "properties.isSystemExtension", + readOnly: true, + type: { + name: "Boolean" + } } } } @@ -1530,6 +1873,13 @@ export const FluxConfiguration: coreClient.CompositeMapper = { className: "BucketDefinition" } }, + azureBlob: { + serializedName: "properties.azureBlob", + type: { + name: "Composite", + className: "AzureBlobDefinition" + } + }, kustomizations: { serializedName: "properties.kustomizations", nullable: true, diff --git a/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/src/models/parameters.ts b/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/src/models/parameters.ts index 80b2a09fb1e3..30bb397bcbf0 100644 --- a/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/src/models/parameters.ts +++ b/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/src/models/parameters.ts @@ -136,7 +136,7 @@ export const extensionName: OperationURLParameter = { export const apiVersion: OperationQueryParameter = { parameterPath: "apiVersion", mapper: { - defaultValue: "2022-03-01", + defaultValue: "2022-11-01", isConstant: true, serializedName: "api-version", type: { diff --git a/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/src/operations/extensions.ts b/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/src/operations/extensions.ts index da2b11a05fc6..38730f086a78 100644 --- a/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/src/operations/extensions.ts +++ b/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/src/operations/extensions.ts @@ -753,7 +753,6 @@ const listNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [Parameters.apiVersion], urlParameters: [ Parameters.$host, Parameters.subscriptionId, diff --git a/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/src/operations/fluxConfigurations.ts b/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/src/operations/fluxConfigurations.ts index e988bf578eb8..9f85a454b7ce 100644 --- a/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/src/operations/fluxConfigurations.ts +++ b/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/src/operations/fluxConfigurations.ts @@ -753,7 +753,6 @@ const listNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [Parameters.apiVersion], urlParameters: [ Parameters.$host, Parameters.subscriptionId, diff --git a/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/src/operations/operationStatus.ts b/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/src/operations/operationStatus.ts index 8b625a801c76..cb16166fbaf7 100644 --- a/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/src/operations/operationStatus.ts +++ b/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/src/operations/operationStatus.ts @@ -300,7 +300,6 @@ const listNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [Parameters.apiVersion], urlParameters: [ Parameters.$host, Parameters.subscriptionId, diff --git a/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/src/operations/operations.ts b/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/src/operations/operations.ts index 8b1e7b20a839..ae33a4175dc7 100644 --- a/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/src/operations/operations.ts +++ b/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/src/operations/operations.ts @@ -143,7 +143,6 @@ const listNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [Parameters.apiVersion], urlParameters: [Parameters.$host, Parameters.nextLink], headerParameters: [Parameters.accept], serializer diff --git a/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/src/operations/sourceControlConfigurations.ts b/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/src/operations/sourceControlConfigurations.ts index b3baeb8e8790..c200034c0a0d 100644 --- a/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/src/operations/sourceControlConfigurations.ts +++ b/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/src/operations/sourceControlConfigurations.ts @@ -503,7 +503,6 @@ const listNextOperationSpec: coreClient.OperationSpec = { bodyMapper: Mappers.ErrorResponse } }, - queryParameters: [Parameters.apiVersion], urlParameters: [ Parameters.$host, Parameters.subscriptionId, diff --git a/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/src/pagingHelper.ts b/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/src/pagingHelper.ts index d85fc13bce1e..269a2b9814b5 100644 --- a/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/src/pagingHelper.ts +++ b/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/src/pagingHelper.ts @@ -13,11 +13,11 @@ export interface PageInfo { const pageMap = new WeakMap(); /** - * Given a result page from a pageable operation, returns a - * continuation token that can be used to begin paging from + * Given the last `.value` produced by the `byPage` iterator, + * returns a continuation token that can be used to begin paging from * that point later. - * @param page A result object from calling .byPage() on a paged operation. - * @returns The continuation token that can be passed into byPage(). + * @param page An object from accessing `value` on the IteratorResult from a `byPage` iterator. + * @returns The continuation token that can be passed into byPage() during future calls. */ export function getContinuationToken(page: unknown): string | undefined { if (typeof page !== "object" || page === null) { diff --git a/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/src/sourceControlConfigurationClient.ts b/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/src/sourceControlConfigurationClient.ts index b20d6036895e..c2956ef9d800 100644 --- a/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/src/sourceControlConfigurationClient.ts +++ b/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/src/sourceControlConfigurationClient.ts @@ -64,7 +64,7 @@ export class SourceControlConfigurationClient extends coreClient.ServiceClient { credential: credentials }; - const packageDetails = `azsdk-js-arm-kubernetesconfiguration/5.1.1`; + const packageDetails = `azsdk-js-arm-kubernetesconfiguration/6.0.0`; const userAgentPrefix = options.userAgentOptions && options.userAgentOptions.userAgentPrefix ? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}` @@ -117,7 +117,7 @@ export class SourceControlConfigurationClient extends coreClient.ServiceClient { // Assigning values to Constant parameters this.$host = options.$host || "https://management.azure.com"; - this.apiVersion = options.apiVersion || "2022-03-01"; + this.apiVersion = options.apiVersion || "2022-11-01"; this.extensions = new ExtensionsImpl(this); this.operationStatus = new OperationStatusImpl(this); this.fluxConfigurations = new FluxConfigurationsImpl(this); diff --git a/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/tsconfig.json b/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/tsconfig.json index 5341a8d13163..3e6ae96443f3 100644 --- a/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/tsconfig.json +++ b/sdk/kubernetesconfiguration/arm-kubernetesconfiguration/tsconfig.json @@ -15,17 +15,11 @@ ], "declaration": true, "outDir": "./dist-esm", - "importHelpers": true, - "paths": { - "@azure/arm-kubernetesconfiguration": [ - "./src/index" - ] - } + "importHelpers": true }, "include": [ "./src/**/*.ts", - "./test/**/*.ts", - "samples-dev/**/*.ts" + "./test/**/*.ts" ], "exclude": [ "node_modules"