From 904e7d1709101f815bca6591033d1ba7478baa36 Mon Sep 17 00:00:00 2001 From: b-jhoreman Date: Mon, 18 Sep 2023 11:55:25 -0700 Subject: [PATCH] upstreaming changes required by upstream CI --- pkg/api/openshiftcluster.go | 2 ++ pkg/api/v20230701preview/openshiftcluster.go | 5 ++++- .../v20230701preview/openshiftcluster_validatestatic.go | 2 +- .../mgmt/2023-07-01-preview/redhatopenshift/enums.go | 4 +++- pkg/swagger/generator.go | 2 +- pkg/swagger/typewalker.go | 1 + swagger/redhatopenshift/resource-manager/readme.md | 9 +++++++++ 7 files changed, 21 insertions(+), 4 deletions(-) diff --git a/pkg/api/openshiftcluster.go b/pkg/api/openshiftcluster.go index fd8a4da8581..228ecbbb49f 100644 --- a/pkg/api/openshiftcluster.go +++ b/pkg/api/openshiftcluster.go @@ -169,10 +169,12 @@ type OpenShiftClusterProperties struct { type ProvisioningState string // ProvisioningState constants +// TODO: ProvisioningStateCancelled is included to pass upstream CI. It is currently unused in ARO. const ( ProvisioningStateCreating ProvisioningState = "Creating" ProvisioningStateUpdating ProvisioningState = "Updating" ProvisioningStateAdminUpdating ProvisioningState = "AdminUpdating" + ProvisioningStateCancelled ProvisioningState = "Cancelled" ProvisioningStateDeleting ProvisioningState = "Deleting" ProvisioningStateSucceeded ProvisioningState = "Succeeded" ProvisioningStateFailed ProvisioningState = "Failed" diff --git a/pkg/api/v20230701preview/openshiftcluster.go b/pkg/api/v20230701preview/openshiftcluster.go index e7574a02d29..cb1d4759e0c 100644 --- a/pkg/api/v20230701preview/openshiftcluster.go +++ b/pkg/api/v20230701preview/openshiftcluster.go @@ -75,9 +75,11 @@ type OpenShiftClusterProperties struct { type ProvisioningState string // ProvisioningState constants. +// TODO: ProvisioningStateCancelled is included to pass upstream CI. It is currently unused in ARO. const ( ProvisioningStateCreating ProvisioningState = "Creating" ProvisioningStateUpdating ProvisioningState = "Updating" + ProvisioningStateCancelled ProvisioningState = "Cancelled" ProvisioningStateAdminUpdating ProvisioningState = "AdminUpdating" ProvisioningStateDeleting ProvisioningState = "Deleting" ProvisioningStateSucceeded ProvisioningState = "Succeeded" @@ -126,6 +128,7 @@ type ServicePrincipalProfile struct { ClientSecret string `json:"clientSecret,omitempty" mutable:"true"` } +// The outbound routing strategy used to provide your cluster egress to the internet. type OutboundType string const ( @@ -135,7 +138,7 @@ const ( // ResourceReference represents a reference to an Azure resource. type ResourceReference struct { - // The fully qualified Azure resource id. + // The fully qualified Azure of an IP address resource. ID string `json:"id,omitempty"` } diff --git a/pkg/api/v20230701preview/openshiftcluster_validatestatic.go b/pkg/api/v20230701preview/openshiftcluster_validatestatic.go index 5469ab91ab2..837bb8e40d5 100644 --- a/pkg/api/v20230701preview/openshiftcluster_validatestatic.go +++ b/pkg/api/v20230701preview/openshiftcluster_validatestatic.go @@ -82,7 +82,7 @@ func (sv openShiftClusterStaticValidator) validateProperties(path string, p *Ope switch p.ProvisioningState { case ProvisioningStateCreating, ProvisioningStateUpdating, ProvisioningStateAdminUpdating, ProvisioningStateDeleting, - ProvisioningStateSucceeded, ProvisioningStateFailed: + ProvisioningStateSucceeded, ProvisioningStateFailed, ProvisioningStateCancelled: default: return api.NewCloudError(http.StatusBadRequest, api.CloudErrorCodeInvalidParameter, path+".provisioningState", "The provided provisioning state '%s' is invalid.", p.ProvisioningState) } diff --git a/pkg/client/services/redhatopenshift/mgmt/2023-07-01-preview/redhatopenshift/enums.go b/pkg/client/services/redhatopenshift/mgmt/2023-07-01-preview/redhatopenshift/enums.go index 10d62db85e9..3611c2528d5 100644 --- a/pkg/client/services/redhatopenshift/mgmt/2023-07-01-preview/redhatopenshift/enums.go +++ b/pkg/client/services/redhatopenshift/mgmt/2023-07-01-preview/redhatopenshift/enums.go @@ -97,11 +97,13 @@ const ( Succeeded ProvisioningState = "Succeeded" // Updating ... Updating ProvisioningState = "Updating" + // Cancelled ... + Cancelled ProvisioningState = "Cancelled" ) // PossibleProvisioningStateValues returns an array of possible values for the ProvisioningState const type. func PossibleProvisioningStateValues() []ProvisioningState { - return []ProvisioningState{AdminUpdating, Creating, Deleting, Failed, Succeeded, Updating} + return []ProvisioningState{AdminUpdating, Creating, Deleting, Failed, Succeeded, Updating, Cancelled} } // Visibility enumerates the values for visibility. diff --git a/pkg/swagger/generator.go b/pkg/swagger/generator.go index 899b3896ce3..1a24a88b0e7 100644 --- a/pkg/swagger/generator.go +++ b/pkg/swagger/generator.go @@ -202,7 +202,7 @@ var apis = map[string]*generator{ exampleOpenShiftVersionListResponse: v20230701preview.ExampleOpenShiftVersionListResponse, exampleOperationListResponse: api.ExampleOperationListResponse, - xmsEnum: []string{"EncryptionAtHost", "FipsValidatedModules", "SoftwareDefinedNetwork", "Visibility"}, + xmsEnum: []string{"EncryptionAtHost", "FipsValidatedModules", "SoftwareDefinedNetwork", "Visibility", "OutboundType"}, xmsSecretList: []string{"kubeconfig", "kubeadminPassword", "secretResources"}, xmsIdentifiers: []string{}, commonTypesVersion: "v3", diff --git a/pkg/swagger/typewalker.go b/pkg/swagger/typewalker.go index 4ca94f458c4..f6068c2c843 100644 --- a/pkg/swagger/typewalker.go +++ b/pkg/swagger/typewalker.go @@ -92,6 +92,7 @@ func (tw *typeWalker) schemaFromType(t types.Type, deps map[*types.Named]struct{ s.Type = "boolean" case types.Int: s.Type = "integer" + s.Format = "int32" case types.String: s.Type = "string" default: diff --git a/swagger/redhatopenshift/resource-manager/readme.md b/swagger/redhatopenshift/resource-manager/readme.md index 9ddba3d53ef..2d3e629cf05 100644 --- a/swagger/redhatopenshift/resource-manager/readme.md +++ b/swagger/redhatopenshift/resource-manager/readme.md @@ -47,6 +47,15 @@ input-file: - Microsoft.RedHatOpenShift/preview/2021-09-01-preview/redhatopenshift.json ``` +### Tag: package-2023-07-01-preview + +These settings apply only when `--tag=package-2023-07-01-preview` is specified on the command line. + +``` yaml $(tag) == 'package-2023-07-01-preview' +input-file: + - Microsoft.RedHatOpenShift/preview/2023-07-01-preview/redhatopenshift.json +``` + ### Tag: package-2022-04-01 These settings apply only when `--tag=package-2022-04-01` is specified on the command line.