From add96accf647d934c90598683728ba042d11a682 Mon Sep 17 00:00:00 2001 From: "red-hat-konflux[bot]" <126015336+red-hat-konflux[bot]@users.noreply.github.com> Date: Wed, 11 Mar 2026 16:16:53 +0000 Subject: [PATCH] Update module github.com/openshift-online/ocm-api-model/clientapi to v0.0.453 Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 +- .../arohcp/v1alpha1/azure_builder.go | 53 ++++++++----- .../v1alpha1/azure_kms_encryption_builder.go | 23 +++++- .../v1alpha1/azure_kms_encryption_type.go | 32 +++++++- .../azure_kms_encryption_type_json.go | 16 +++- ...ms_encryption_visibility_list_type_json.go | 76 +++++++++++++++++++ .../azure_kms_encryption_visibility_type.go | 30 ++++++++ .../clientapi/arohcp/v1alpha1/azure_type.go | 56 ++++++++++---- .../arohcp/v1alpha1/azure_type_json.go | 43 +++++++---- vendor/modules.txt | 2 +- 11 files changed, 277 insertions(+), 60 deletions(-) create mode 100644 vendor/github.com/openshift-online/ocm-api-model/clientapi/arohcp/v1alpha1/azure_kms_encryption_visibility_list_type_json.go create mode 100644 vendor/github.com/openshift-online/ocm-api-model/clientapi/arohcp/v1alpha1/azure_kms_encryption_visibility_type.go diff --git a/go.mod b/go.mod index 80b7174908..551333fd5b 100644 --- a/go.mod +++ b/go.mod @@ -29,7 +29,7 @@ require ( github.com/nathan-fiscaletti/consolesize-go v0.0.0-20210105204122-a87d9f614b9d github.com/onsi/ginkgo/v2 v2.17.1 github.com/onsi/gomega v1.30.0 - github.com/openshift-online/ocm-api-model/clientapi v0.0.452 + github.com/openshift-online/ocm-api-model/clientapi v0.0.453 github.com/openshift-online/ocm-common v0.0.32 github.com/openshift-online/ocm-sdk-go v0.1.497 github.com/pkg/errors v0.9.1 diff --git a/go.sum b/go.sum index ac801eb232..9e5952ce11 100644 --- a/go.sum +++ b/go.sum @@ -274,8 +274,8 @@ github.com/onsi/ginkgo/v2 v2.17.1 h1:V++EzdbhI4ZV4ev0UTIj0PzhzOcReJFyJaLjtSF55M8 github.com/onsi/ginkgo/v2 v2.17.1/go.mod h1:llBI3WDLL9Z6taip6f33H76YcWtJv+7R3HigUjbIBOs= github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8= github.com/onsi/gomega v1.30.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ= -github.com/openshift-online/ocm-api-model/clientapi v0.0.452 h1:gK2zz2eozL0dc/lKe/uojmffVra22pk17IUHW8/IoWk= -github.com/openshift-online/ocm-api-model/clientapi v0.0.452/go.mod h1:fZwy5HY2URG9nrExvQeXrDU/08TGqZ16f8oymVEN5lo= +github.com/openshift-online/ocm-api-model/clientapi v0.0.453 h1:2KwHcetQzaCNFykGnLnn69SqTEkHldFRNB3fIsWalLw= +github.com/openshift-online/ocm-api-model/clientapi v0.0.453/go.mod h1:fZwy5HY2URG9nrExvQeXrDU/08TGqZ16f8oymVEN5lo= github.com/openshift-online/ocm-api-model/model v0.0.452 h1:bjFQnIiYNWReQX4FFqqeMYEtFs3EwIi5lCVx1ZKBI+Y= github.com/openshift-online/ocm-api-model/model v0.0.452/go.mod h1:PQIoq6P8Vlb7goOdRMLK8nJY+B7HH0RTqYAa4kyidTE= github.com/openshift-online/ocm-common v0.0.32 h1:SApMbDZ/jGa4h+77A8rBGdGd84E6u1eN+eV5PoiJSaQ= diff --git a/vendor/github.com/openshift-online/ocm-api-model/clientapi/arohcp/v1alpha1/azure_builder.go b/vendor/github.com/openshift-online/ocm-api-model/clientapi/arohcp/v1alpha1/azure_builder.go index 961271abfe..15f71734e3 100644 --- a/vendor/github.com/openshift-online/ocm-api-model/clientapi/arohcp/v1alpha1/azure_builder.go +++ b/vendor/github.com/openshift-online/ocm-api-model/clientapi/arohcp/v1alpha1/azure_builder.go @@ -26,6 +26,7 @@ type AzureBuilder struct { managedResourceGroupName string networkSecurityGroupResourceID string nodesOutboundConnectivity *AzureNodesOutboundConnectivityBuilder + oidcIssuerUrl string operatorsAuthentication *AzureOperatorsAuthenticationBuilder resourceGroupName string resourceName string @@ -38,7 +39,7 @@ type AzureBuilder struct { // NewAzure creates a new builder of 'azure' objects. func NewAzure() *AzureBuilder { return &AzureBuilder{ - fieldSet_: make([]bool, 11), + fieldSet_: make([]bool, 12), } } @@ -60,7 +61,7 @@ func (b *AzureBuilder) Empty() bool { // Contains the necessary attributes to support etcd encryption for Azure based clusters. func (b *AzureBuilder) EtcdEncryption(value *AzureEtcdEncryptionBuilder) *AzureBuilder { if len(b.fieldSet_) == 0 { - b.fieldSet_ = make([]bool, 11) + b.fieldSet_ = make([]bool, 12) } b.etcdEncryption = value if value != nil { @@ -74,7 +75,7 @@ func (b *AzureBuilder) EtcdEncryption(value *AzureEtcdEncryptionBuilder) *AzureB // ManagedResourceGroupName sets the value of the 'managed_resource_group_name' attribute to the given value. func (b *AzureBuilder) ManagedResourceGroupName(value string) *AzureBuilder { if len(b.fieldSet_) == 0 { - b.fieldSet_ = make([]bool, 11) + b.fieldSet_ = make([]bool, 12) } b.managedResourceGroupName = value b.fieldSet_[1] = true @@ -84,7 +85,7 @@ func (b *AzureBuilder) ManagedResourceGroupName(value string) *AzureBuilder { // NetworkSecurityGroupResourceID sets the value of the 'network_security_group_resource_ID' attribute to the given value. func (b *AzureBuilder) NetworkSecurityGroupResourceID(value string) *AzureBuilder { if len(b.fieldSet_) == 0 { - b.fieldSet_ = make([]bool, 11) + b.fieldSet_ = make([]bool, 12) } b.networkSecurityGroupResourceID = value b.fieldSet_[2] = true @@ -96,7 +97,7 @@ func (b *AzureBuilder) NetworkSecurityGroupResourceID(value string) *AzureBuilde // The configuration of the node outbound connectivity func (b *AzureBuilder) NodesOutboundConnectivity(value *AzureNodesOutboundConnectivityBuilder) *AzureBuilder { if len(b.fieldSet_) == 0 { - b.fieldSet_ = make([]bool, 11) + b.fieldSet_ = make([]bool, 12) } b.nodesOutboundConnectivity = value if value != nil { @@ -107,19 +108,29 @@ func (b *AzureBuilder) NodesOutboundConnectivity(value *AzureNodesOutboundConnec return b } +// OidcIssuerUrl sets the value of the 'oidc_issuer_url' attribute to the given value. +func (b *AzureBuilder) OidcIssuerUrl(value string) *AzureBuilder { + if len(b.fieldSet_) == 0 { + b.fieldSet_ = make([]bool, 12) + } + b.oidcIssuerUrl = value + b.fieldSet_[4] = true + return b +} + // OperatorsAuthentication sets the value of the 'operators_authentication' attribute to the given value. // // The configuration that the operators of the // cluster have to authenticate to Azure. func (b *AzureBuilder) OperatorsAuthentication(value *AzureOperatorsAuthenticationBuilder) *AzureBuilder { if len(b.fieldSet_) == 0 { - b.fieldSet_ = make([]bool, 11) + b.fieldSet_ = make([]bool, 12) } b.operatorsAuthentication = value if value != nil { - b.fieldSet_[4] = true + b.fieldSet_[5] = true } else { - b.fieldSet_[4] = false + b.fieldSet_[5] = false } return b } @@ -127,60 +138,60 @@ func (b *AzureBuilder) OperatorsAuthentication(value *AzureOperatorsAuthenticati // ResourceGroupName sets the value of the 'resource_group_name' attribute to the given value. func (b *AzureBuilder) ResourceGroupName(value string) *AzureBuilder { if len(b.fieldSet_) == 0 { - b.fieldSet_ = make([]bool, 11) + b.fieldSet_ = make([]bool, 12) } b.resourceGroupName = value - b.fieldSet_[5] = true + b.fieldSet_[6] = true return b } // ResourceName sets the value of the 'resource_name' attribute to the given value. func (b *AzureBuilder) ResourceName(value string) *AzureBuilder { if len(b.fieldSet_) == 0 { - b.fieldSet_ = make([]bool, 11) + b.fieldSet_ = make([]bool, 12) } b.resourceName = value - b.fieldSet_[6] = true + b.fieldSet_[7] = true return b } // SubnetResourceID sets the value of the 'subnet_resource_ID' attribute to the given value. func (b *AzureBuilder) SubnetResourceID(value string) *AzureBuilder { if len(b.fieldSet_) == 0 { - b.fieldSet_ = make([]bool, 11) + b.fieldSet_ = make([]bool, 12) } b.subnetResourceID = value - b.fieldSet_[7] = true + b.fieldSet_[8] = true return b } // SubscriptionID sets the value of the 'subscription_ID' attribute to the given value. func (b *AzureBuilder) SubscriptionID(value string) *AzureBuilder { if len(b.fieldSet_) == 0 { - b.fieldSet_ = make([]bool, 11) + b.fieldSet_ = make([]bool, 12) } b.subscriptionID = value - b.fieldSet_[8] = true + b.fieldSet_[9] = true return b } // TenantID sets the value of the 'tenant_ID' attribute to the given value. func (b *AzureBuilder) TenantID(value string) *AzureBuilder { if len(b.fieldSet_) == 0 { - b.fieldSet_ = make([]bool, 11) + b.fieldSet_ = make([]bool, 12) } b.tenantID = value - b.fieldSet_[9] = true + b.fieldSet_[10] = true return b } // VnetIntegrationSubnetResourceID sets the value of the 'vnet_integration_subnet_resource_ID' attribute to the given value. func (b *AzureBuilder) VnetIntegrationSubnetResourceID(value string) *AzureBuilder { if len(b.fieldSet_) == 0 { - b.fieldSet_ = make([]bool, 11) + b.fieldSet_ = make([]bool, 12) } b.vnetIntegrationSubnetResourceID = value - b.fieldSet_[10] = true + b.fieldSet_[11] = true return b } @@ -205,6 +216,7 @@ func (b *AzureBuilder) Copy(object *Azure) *AzureBuilder { } else { b.nodesOutboundConnectivity = nil } + b.oidcIssuerUrl = object.oidcIssuerUrl if object.operatorsAuthentication != nil { b.operatorsAuthentication = NewAzureOperatorsAuthentication().Copy(object.operatorsAuthentication) } else { @@ -240,6 +252,7 @@ func (b *AzureBuilder) Build() (object *Azure, err error) { return } } + object.oidcIssuerUrl = b.oidcIssuerUrl if b.operatorsAuthentication != nil { object.operatorsAuthentication, err = b.operatorsAuthentication.Build() if err != nil { diff --git a/vendor/github.com/openshift-online/ocm-api-model/clientapi/arohcp/v1alpha1/azure_kms_encryption_builder.go b/vendor/github.com/openshift-online/ocm-api-model/clientapi/arohcp/v1alpha1/azure_kms_encryption_builder.go index d081ea7f45..f8ef68e772 100644 --- a/vendor/github.com/openshift-online/ocm-api-model/clientapi/arohcp/v1alpha1/azure_kms_encryption_builder.go +++ b/vendor/github.com/openshift-online/ocm-api-model/clientapi/arohcp/v1alpha1/azure_kms_encryption_builder.go @@ -21,14 +21,15 @@ package v1alpha1 // github.com/openshift-online/ocm-api-model/clientapi/arohcp/v // Contains the necessary attributes to support KMS encryption for Azure based clusters. type AzureKmsEncryptionBuilder struct { - fieldSet_ []bool - activeKey *AzureKmsKeyBuilder + fieldSet_ []bool + activeKey *AzureKmsKeyBuilder + visibility AzureKmsEncryptionVisibility } // NewAzureKmsEncryption creates a new builder of 'azure_kms_encryption' objects. func NewAzureKmsEncryption() *AzureKmsEncryptionBuilder { return &AzureKmsEncryptionBuilder{ - fieldSet_: make([]bool, 1), + fieldSet_: make([]bool, 2), } } @@ -50,7 +51,7 @@ func (b *AzureKmsEncryptionBuilder) Empty() bool { // Contains the necessary attributes to support KMS encryption key for Azure based clusters func (b *AzureKmsEncryptionBuilder) ActiveKey(value *AzureKmsKeyBuilder) *AzureKmsEncryptionBuilder { if len(b.fieldSet_) == 0 { - b.fieldSet_ = make([]bool, 1) + b.fieldSet_ = make([]bool, 2) } b.activeKey = value if value != nil { @@ -61,6 +62,18 @@ func (b *AzureKmsEncryptionBuilder) ActiveKey(value *AzureKmsKeyBuilder) *AzureK return b } +// Visibility sets the value of the 'visibility' attribute to the given value. +// +// AzureKmsEncryptionVisibility defines the visibility of the Azure KMS key vault. +func (b *AzureKmsEncryptionBuilder) Visibility(value AzureKmsEncryptionVisibility) *AzureKmsEncryptionBuilder { + if len(b.fieldSet_) == 0 { + b.fieldSet_ = make([]bool, 2) + } + b.visibility = value + b.fieldSet_[1] = true + return b +} + // Copy copies the attributes of the given object into this builder, discarding any previous values. func (b *AzureKmsEncryptionBuilder) Copy(object *AzureKmsEncryption) *AzureKmsEncryptionBuilder { if object == nil { @@ -75,6 +88,7 @@ func (b *AzureKmsEncryptionBuilder) Copy(object *AzureKmsEncryption) *AzureKmsEn } else { b.activeKey = nil } + b.visibility = object.visibility return b } @@ -91,5 +105,6 @@ func (b *AzureKmsEncryptionBuilder) Build() (object *AzureKmsEncryption, err err return } } + object.visibility = b.visibility return } diff --git a/vendor/github.com/openshift-online/ocm-api-model/clientapi/arohcp/v1alpha1/azure_kms_encryption_type.go b/vendor/github.com/openshift-online/ocm-api-model/clientapi/arohcp/v1alpha1/azure_kms_encryption_type.go index 35404ef44c..6f067a040c 100644 --- a/vendor/github.com/openshift-online/ocm-api-model/clientapi/arohcp/v1alpha1/azure_kms_encryption_type.go +++ b/vendor/github.com/openshift-online/ocm-api-model/clientapi/arohcp/v1alpha1/azure_kms_encryption_type.go @@ -23,8 +23,9 @@ package v1alpha1 // github.com/openshift-online/ocm-api-model/clientapi/arohcp/v // // Contains the necessary attributes to support KMS encryption for Azure based clusters. type AzureKmsEncryption struct { - fieldSet_ []bool - activeKey *AzureKmsKey + fieldSet_ []bool + activeKey *AzureKmsKey + visibility AzureKmsEncryptionVisibility } // Empty returns true if the object is empty, i.e. no attribute has a value. @@ -65,6 +66,33 @@ func (o *AzureKmsEncryption) GetActiveKey() (value *AzureKmsKey, ok bool) { return } +// Visibility returns the value of the 'visibility' attribute, or +// the zero value of the type if the attribute doesn't have a value. +// +// visibility defines the visibility of the Azure Key Vault. +// Accepted values are `public` and `private`. +// Defaults to `public` if not set. +func (o *AzureKmsEncryption) Visibility() AzureKmsEncryptionVisibility { + if o != nil && len(o.fieldSet_) > 1 && o.fieldSet_[1] { + return o.visibility + } + return AzureKmsEncryptionVisibility("") +} + +// GetVisibility returns the value of the 'visibility' attribute and +// a flag indicating if the attribute has a value. +// +// visibility defines the visibility of the Azure Key Vault. +// Accepted values are `public` and `private`. +// Defaults to `public` if not set. +func (o *AzureKmsEncryption) GetVisibility() (value AzureKmsEncryptionVisibility, ok bool) { + ok = o != nil && len(o.fieldSet_) > 1 && o.fieldSet_[1] + if ok { + value = o.visibility + } + return +} + // AzureKmsEncryptionListKind is the name of the type used to represent list of objects of // type 'azure_kms_encryption'. const AzureKmsEncryptionListKind = "AzureKmsEncryptionList" diff --git a/vendor/github.com/openshift-online/ocm-api-model/clientapi/arohcp/v1alpha1/azure_kms_encryption_type_json.go b/vendor/github.com/openshift-online/ocm-api-model/clientapi/arohcp/v1alpha1/azure_kms_encryption_type_json.go index 4912c74a30..1290f1586c 100644 --- a/vendor/github.com/openshift-online/ocm-api-model/clientapi/arohcp/v1alpha1/azure_kms_encryption_type_json.go +++ b/vendor/github.com/openshift-online/ocm-api-model/clientapi/arohcp/v1alpha1/azure_kms_encryption_type_json.go @@ -49,6 +49,15 @@ func WriteAzureKmsEncryption(object *AzureKmsEncryption, stream *jsoniter.Stream } stream.WriteObjectField("active_key") WriteAzureKmsKey(object.activeKey, stream) + count++ + } + present_ = len(object.fieldSet_) > 1 && object.fieldSet_[1] + if present_ { + if count > 0 { + stream.WriteMore() + } + stream.WriteObjectField("visibility") + stream.WriteString(string(object.visibility)) } stream.WriteObjectEnd() } @@ -68,7 +77,7 @@ func UnmarshalAzureKmsEncryption(source interface{}) (object *AzureKmsEncryption // ReadAzureKmsEncryption reads a value of the 'azure_kms_encryption' type from the given iterator. func ReadAzureKmsEncryption(iterator *jsoniter.Iterator) *AzureKmsEncryption { object := &AzureKmsEncryption{ - fieldSet_: make([]bool, 1), + fieldSet_: make([]bool, 2), } for { field := iterator.ReadObject() @@ -80,6 +89,11 @@ func ReadAzureKmsEncryption(iterator *jsoniter.Iterator) *AzureKmsEncryption { value := ReadAzureKmsKey(iterator) object.activeKey = value object.fieldSet_[0] = true + case "visibility": + text := iterator.ReadString() + value := AzureKmsEncryptionVisibility(text) + object.visibility = value + object.fieldSet_[1] = true default: iterator.ReadAny() } diff --git a/vendor/github.com/openshift-online/ocm-api-model/clientapi/arohcp/v1alpha1/azure_kms_encryption_visibility_list_type_json.go b/vendor/github.com/openshift-online/ocm-api-model/clientapi/arohcp/v1alpha1/azure_kms_encryption_visibility_list_type_json.go new file mode 100644 index 0000000000..6c96a79436 --- /dev/null +++ b/vendor/github.com/openshift-online/ocm-api-model/clientapi/arohcp/v1alpha1/azure_kms_encryption_visibility_list_type_json.go @@ -0,0 +1,76 @@ +/* +Copyright (c) 2020 Red Hat, Inc. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// IMPORTANT: This file has been generated automatically, refrain from modifying it manually as all +// your changes will be lost when the file is generated again. + +package v1alpha1 // github.com/openshift-online/ocm-api-model/clientapi/arohcp/v1alpha1 + +import ( + "io" + + jsoniter "github.com/json-iterator/go" + "github.com/openshift-online/ocm-api-model/clientapi/helpers" +) + +// MarshalAzureKmsEncryptionVisibilityList writes a list of values of the 'azure_kms_encryption_visibility' type to +// the given writer. +func MarshalAzureKmsEncryptionVisibilityList(list []AzureKmsEncryptionVisibility, writer io.Writer) error { + stream := helpers.NewStream(writer) + WriteAzureKmsEncryptionVisibilityList(list, stream) + err := stream.Flush() + if err != nil { + return err + } + return stream.Error +} + +// WriteAzureKmsEncryptionVisibilityList writes a list of value of the 'azure_kms_encryption_visibility' type to +// the given stream. +func WriteAzureKmsEncryptionVisibilityList(list []AzureKmsEncryptionVisibility, stream *jsoniter.Stream) { + stream.WriteArrayStart() + for i, value := range list { + if i > 0 { + stream.WriteMore() + } + stream.WriteString(string(value)) + } + stream.WriteArrayEnd() +} + +// UnmarshalAzureKmsEncryptionVisibilityList reads a list of values of the 'azure_kms_encryption_visibility' type +// from the given source, which can be a slice of bytes, a string or a reader. +func UnmarshalAzureKmsEncryptionVisibilityList(source interface{}) (items []AzureKmsEncryptionVisibility, err error) { + iterator, err := helpers.NewIterator(source) + if err != nil { + return + } + items = ReadAzureKmsEncryptionVisibilityList(iterator) + err = iterator.Error + return +} + +// ReadAzureKmsEncryptionVisibilityList reads list of values of the ”azure_kms_encryption_visibility' type from +// the given iterator. +func ReadAzureKmsEncryptionVisibilityList(iterator *jsoniter.Iterator) []AzureKmsEncryptionVisibility { + list := []AzureKmsEncryptionVisibility{} + for iterator.ReadArray() { + text := iterator.ReadString() + item := AzureKmsEncryptionVisibility(text) + list = append(list, item) + } + return list +} diff --git a/vendor/github.com/openshift-online/ocm-api-model/clientapi/arohcp/v1alpha1/azure_kms_encryption_visibility_type.go b/vendor/github.com/openshift-online/ocm-api-model/clientapi/arohcp/v1alpha1/azure_kms_encryption_visibility_type.go new file mode 100644 index 0000000000..0fe57d2d34 --- /dev/null +++ b/vendor/github.com/openshift-online/ocm-api-model/clientapi/arohcp/v1alpha1/azure_kms_encryption_visibility_type.go @@ -0,0 +1,30 @@ +/* +Copyright (c) 2020 Red Hat, Inc. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// IMPORTANT: This file has been generated automatically, refrain from modifying it manually as all +// your changes will be lost when the file is generated again. + +package v1alpha1 // github.com/openshift-online/ocm-api-model/clientapi/arohcp/v1alpha1 + +// AzureKmsEncryptionVisibility represents the values of the 'azure_kms_encryption_visibility' enumerated type. +type AzureKmsEncryptionVisibility string + +const ( + // The key vault is privately accessible. + AzureKmsEncryptionVisibilityPrivate AzureKmsEncryptionVisibility = "private" + // The key vault is publicly accessible. + AzureKmsEncryptionVisibilityPublic AzureKmsEncryptionVisibility = "public" +) diff --git a/vendor/github.com/openshift-online/ocm-api-model/clientapi/arohcp/v1alpha1/azure_type.go b/vendor/github.com/openshift-online/ocm-api-model/clientapi/arohcp/v1alpha1/azure_type.go index f66c2ba4b9..75913457b4 100644 --- a/vendor/github.com/openshift-online/ocm-api-model/clientapi/arohcp/v1alpha1/azure_type.go +++ b/vendor/github.com/openshift-online/ocm-api-model/clientapi/arohcp/v1alpha1/azure_type.go @@ -28,6 +28,7 @@ type Azure struct { managedResourceGroupName string networkSecurityGroupResourceID string nodesOutboundConnectivity *AzureNodesOutboundConnectivity + oidcIssuerUrl string operatorsAuthentication *AzureOperatorsAuthentication resourceGroupName string resourceName string @@ -212,6 +213,33 @@ func (o *Azure) GetNodesOutboundConnectivity() (value *AzureNodesOutboundConnect return } +// OidcIssuerUrl returns the value of the 'oidc_issuer_url' attribute, or +// the zero value of the type if the attribute doesn't have a value. +// +// The OIDC issuer URL for workload identity federation +// This URL is used by Azure managed identities to establish trust with cluster. +// Readonly +func (o *Azure) OidcIssuerUrl() string { + if o != nil && len(o.fieldSet_) > 4 && o.fieldSet_[4] { + return o.oidcIssuerUrl + } + return "" +} + +// GetOidcIssuerUrl returns the value of the 'oidc_issuer_url' attribute and +// a flag indicating if the attribute has a value. +// +// The OIDC issuer URL for workload identity federation +// This URL is used by Azure managed identities to establish trust with cluster. +// Readonly +func (o *Azure) GetOidcIssuerUrl() (value string, ok bool) { + ok = o != nil && len(o.fieldSet_) > 4 && o.fieldSet_[4] + if ok { + value = o.oidcIssuerUrl + } + return +} + // OperatorsAuthentication returns the value of the 'operators_authentication' attribute, or // the zero value of the type if the attribute doesn't have a value. // @@ -219,7 +247,7 @@ func (o *Azure) GetNodesOutboundConnectivity() (value *AzureNodesOutboundConnect // Required during creation. // Immutable. func (o *Azure) OperatorsAuthentication() *AzureOperatorsAuthentication { - if o != nil && len(o.fieldSet_) > 4 && o.fieldSet_[4] { + if o != nil && len(o.fieldSet_) > 5 && o.fieldSet_[5] { return o.operatorsAuthentication } return nil @@ -232,7 +260,7 @@ func (o *Azure) OperatorsAuthentication() *AzureOperatorsAuthentication { // Required during creation. // Immutable. func (o *Azure) GetOperatorsAuthentication() (value *AzureOperatorsAuthentication, ok bool) { - ok = o != nil && len(o.fieldSet_) > 4 && o.fieldSet_[4] + ok = o != nil && len(o.fieldSet_) > 5 && o.fieldSet_[5] if ok { value = o.operatorsAuthentication } @@ -250,7 +278,7 @@ func (o *Azure) GetOperatorsAuthentication() (value *AzureOperatorsAuthenticatio // Required during creation. // Immutable. func (o *Azure) ResourceGroupName() string { - if o != nil && len(o.fieldSet_) > 5 && o.fieldSet_[5] { + if o != nil && len(o.fieldSet_) > 6 && o.fieldSet_[6] { return o.resourceGroupName } return "" @@ -267,7 +295,7 @@ func (o *Azure) ResourceGroupName() string { // Required during creation. // Immutable. func (o *Azure) GetResourceGroupName() (value string, ok bool) { - ok = o != nil && len(o.fieldSet_) > 5 && o.fieldSet_[5] + ok = o != nil && len(o.fieldSet_) > 6 && o.fieldSet_[6] if ok { value = o.resourceGroupName } @@ -283,7 +311,7 @@ func (o *Azure) GetResourceGroupName() (value string, ok bool) { // Required during creation. // Immutable. func (o *Azure) ResourceName() string { - if o != nil && len(o.fieldSet_) > 6 && o.fieldSet_[6] { + if o != nil && len(o.fieldSet_) > 7 && o.fieldSet_[7] { return o.resourceName } return "" @@ -298,7 +326,7 @@ func (o *Azure) ResourceName() string { // Required during creation. // Immutable. func (o *Azure) GetResourceName() (value string, ok bool) { - ok = o != nil && len(o.fieldSet_) > 6 && o.fieldSet_[6] + ok = o != nil && len(o.fieldSet_) > 7 && o.fieldSet_[7] if ok { value = o.resourceName } @@ -325,7 +353,7 @@ func (o *Azure) GetResourceName() (value string, ok bool) { // Required during creation. // Immutable. func (o *Azure) SubnetResourceID() string { - if o != nil && len(o.fieldSet_) > 7 && o.fieldSet_[7] { + if o != nil && len(o.fieldSet_) > 8 && o.fieldSet_[8] { return o.subnetResourceID } return "" @@ -351,7 +379,7 @@ func (o *Azure) SubnetResourceID() string { // Required during creation. // Immutable. func (o *Azure) GetSubnetResourceID() (value string, ok bool) { - ok = o != nil && len(o.fieldSet_) > 7 && o.fieldSet_[7] + ok = o != nil && len(o.fieldSet_) > 8 && o.fieldSet_[8] if ok { value = o.subnetResourceID } @@ -366,7 +394,7 @@ func (o *Azure) GetSubnetResourceID() (value string, ok bool) { // Required during creation. // Immutable. func (o *Azure) SubscriptionID() string { - if o != nil && len(o.fieldSet_) > 8 && o.fieldSet_[8] { + if o != nil && len(o.fieldSet_) > 9 && o.fieldSet_[9] { return o.subscriptionID } return "" @@ -380,7 +408,7 @@ func (o *Azure) SubscriptionID() string { // Required during creation. // Immutable. func (o *Azure) GetSubscriptionID() (value string, ok bool) { - ok = o != nil && len(o.fieldSet_) > 8 && o.fieldSet_[8] + ok = o != nil && len(o.fieldSet_) > 9 && o.fieldSet_[9] if ok { value = o.subscriptionID } @@ -394,7 +422,7 @@ func (o *Azure) GetSubscriptionID() (value string, ok bool) { // Required during creation. // Immutable. func (o *Azure) TenantID() string { - if o != nil && len(o.fieldSet_) > 9 && o.fieldSet_[9] { + if o != nil && len(o.fieldSet_) > 10 && o.fieldSet_[10] { return o.tenantID } return "" @@ -407,7 +435,7 @@ func (o *Azure) TenantID() string { // Required during creation. // Immutable. func (o *Azure) GetTenantID() (value string, ok bool) { - ok = o != nil && len(o.fieldSet_) > 9 && o.fieldSet_[9] + ok = o != nil && len(o.fieldSet_) > 10 && o.fieldSet_[10] if ok { value = o.tenantID } @@ -428,7 +456,7 @@ func (o *Azure) GetTenantID() (value string, ok bool) { // This field is optional - if not specified, SWIFT networking will not be enabled. // Immutable. func (o *Azure) VnetIntegrationSubnetResourceID() string { - if o != nil && len(o.fieldSet_) > 10 && o.fieldSet_[10] { + if o != nil && len(o.fieldSet_) > 11 && o.fieldSet_[11] { return o.vnetIntegrationSubnetResourceID } return "" @@ -448,7 +476,7 @@ func (o *Azure) VnetIntegrationSubnetResourceID() string { // This field is optional - if not specified, SWIFT networking will not be enabled. // Immutable. func (o *Azure) GetVnetIntegrationSubnetResourceID() (value string, ok bool) { - ok = o != nil && len(o.fieldSet_) > 10 && o.fieldSet_[10] + ok = o != nil && len(o.fieldSet_) > 11 && o.fieldSet_[11] if ok { value = o.vnetIntegrationSubnetResourceID } diff --git a/vendor/github.com/openshift-online/ocm-api-model/clientapi/arohcp/v1alpha1/azure_type_json.go b/vendor/github.com/openshift-online/ocm-api-model/clientapi/arohcp/v1alpha1/azure_type_json.go index 22e6f56d14..eb23f2639c 100644 --- a/vendor/github.com/openshift-online/ocm-api-model/clientapi/arohcp/v1alpha1/azure_type_json.go +++ b/vendor/github.com/openshift-online/ocm-api-model/clientapi/arohcp/v1alpha1/azure_type_json.go @@ -78,7 +78,16 @@ func WriteAzure(object *Azure, stream *jsoniter.Stream) { WriteAzureNodesOutboundConnectivity(object.nodesOutboundConnectivity, stream) count++ } - present_ = len(object.fieldSet_) > 4 && object.fieldSet_[4] && object.operatorsAuthentication != nil + present_ = len(object.fieldSet_) > 4 && object.fieldSet_[4] + if present_ { + if count > 0 { + stream.WriteMore() + } + stream.WriteObjectField("oidc_issuer_url") + stream.WriteString(object.oidcIssuerUrl) + count++ + } + present_ = len(object.fieldSet_) > 5 && object.fieldSet_[5] && object.operatorsAuthentication != nil if present_ { if count > 0 { stream.WriteMore() @@ -87,7 +96,7 @@ func WriteAzure(object *Azure, stream *jsoniter.Stream) { WriteAzureOperatorsAuthentication(object.operatorsAuthentication, stream) count++ } - present_ = len(object.fieldSet_) > 5 && object.fieldSet_[5] + present_ = len(object.fieldSet_) > 6 && object.fieldSet_[6] if present_ { if count > 0 { stream.WriteMore() @@ -96,7 +105,7 @@ func WriteAzure(object *Azure, stream *jsoniter.Stream) { stream.WriteString(object.resourceGroupName) count++ } - present_ = len(object.fieldSet_) > 6 && object.fieldSet_[6] + present_ = len(object.fieldSet_) > 7 && object.fieldSet_[7] if present_ { if count > 0 { stream.WriteMore() @@ -105,7 +114,7 @@ func WriteAzure(object *Azure, stream *jsoniter.Stream) { stream.WriteString(object.resourceName) count++ } - present_ = len(object.fieldSet_) > 7 && object.fieldSet_[7] + present_ = len(object.fieldSet_) > 8 && object.fieldSet_[8] if present_ { if count > 0 { stream.WriteMore() @@ -114,7 +123,7 @@ func WriteAzure(object *Azure, stream *jsoniter.Stream) { stream.WriteString(object.subnetResourceID) count++ } - present_ = len(object.fieldSet_) > 8 && object.fieldSet_[8] + present_ = len(object.fieldSet_) > 9 && object.fieldSet_[9] if present_ { if count > 0 { stream.WriteMore() @@ -123,7 +132,7 @@ func WriteAzure(object *Azure, stream *jsoniter.Stream) { stream.WriteString(object.subscriptionID) count++ } - present_ = len(object.fieldSet_) > 9 && object.fieldSet_[9] + present_ = len(object.fieldSet_) > 10 && object.fieldSet_[10] if present_ { if count > 0 { stream.WriteMore() @@ -132,7 +141,7 @@ func WriteAzure(object *Azure, stream *jsoniter.Stream) { stream.WriteString(object.tenantID) count++ } - present_ = len(object.fieldSet_) > 10 && object.fieldSet_[10] + present_ = len(object.fieldSet_) > 11 && object.fieldSet_[11] if present_ { if count > 0 { stream.WriteMore() @@ -158,7 +167,7 @@ func UnmarshalAzure(source interface{}) (object *Azure, err error) { // ReadAzure reads a value of the 'azure' type from the given iterator. func ReadAzure(iterator *jsoniter.Iterator) *Azure { object := &Azure{ - fieldSet_: make([]bool, 11), + fieldSet_: make([]bool, 12), } for { field := iterator.ReadObject() @@ -182,34 +191,38 @@ func ReadAzure(iterator *jsoniter.Iterator) *Azure { value := ReadAzureNodesOutboundConnectivity(iterator) object.nodesOutboundConnectivity = value object.fieldSet_[3] = true + case "oidc_issuer_url": + value := iterator.ReadString() + object.oidcIssuerUrl = value + object.fieldSet_[4] = true case "operators_authentication": value := ReadAzureOperatorsAuthentication(iterator) object.operatorsAuthentication = value - object.fieldSet_[4] = true + object.fieldSet_[5] = true case "resource_group_name": value := iterator.ReadString() object.resourceGroupName = value - object.fieldSet_[5] = true + object.fieldSet_[6] = true case "resource_name": value := iterator.ReadString() object.resourceName = value - object.fieldSet_[6] = true + object.fieldSet_[7] = true case "subnet_resource_id": value := iterator.ReadString() object.subnetResourceID = value - object.fieldSet_[7] = true + object.fieldSet_[8] = true case "subscription_id": value := iterator.ReadString() object.subscriptionID = value - object.fieldSet_[8] = true + object.fieldSet_[9] = true case "tenant_id": value := iterator.ReadString() object.tenantID = value - object.fieldSet_[9] = true + object.fieldSet_[10] = true case "vnet_integration_subnet_resource_id": value := iterator.ReadString() object.vnetIntegrationSubnetResourceID = value - object.fieldSet_[10] = true + object.fieldSet_[11] = true default: iterator.ReadAny() } diff --git a/vendor/modules.txt b/vendor/modules.txt index 7782bd74f3..6aa09cf994 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -416,7 +416,7 @@ github.com/onsi/gomega/matchers/support/goraph/edge github.com/onsi/gomega/matchers/support/goraph/node github.com/onsi/gomega/matchers/support/goraph/util github.com/onsi/gomega/types -# github.com/openshift-online/ocm-api-model/clientapi v0.0.452 +# github.com/openshift-online/ocm-api-model/clientapi v0.0.453 ## explicit; go 1.23.0 github.com/openshift-online/ocm-api-model/clientapi/accesstransparency/v1 github.com/openshift-online/ocm-api-model/clientapi/accountsmgmt/v1