From aa21f59c721ba4747dd944c07624739b7bea6fe9 Mon Sep 17 00:00:00 2001 From: Rajdeep Singh Chauhan Date: Fri, 3 Jan 2025 11:06:38 -0500 Subject: [PATCH] populate name and type for new openshift rolesets and versions --- cmd/aro/update_ocp_versions.go | 2 ++ cmd/aro/update_role_sets.go | 2 ++ pkg/api/admin/openshiftversion.go | 3 +++ pkg/api/admin/openshiftversion_convert.go | 10 ++++++++++ pkg/api/admin/platformworkloadidentityroleset.go | 3 +++ .../platformworkloadidentityroleset_convert.go | 4 ++++ .../v20240812preview/openshiftversion_convert.go | 14 ++++++++++++-- .../platformworkloadidentityroleset_convert.go | 6 ++++-- 8 files changed, 40 insertions(+), 4 deletions(-) diff --git a/cmd/aro/update_ocp_versions.go b/cmd/aro/update_ocp_versions.go index b5d7eff1924..c8a7a068a18 100644 --- a/cmd/aro/update_ocp_versions.go +++ b/cmd/aro/update_ocp_versions.go @@ -101,6 +101,8 @@ func appendOpenShiftVersions(ocpVersions []api.OpenShiftVersion, installStreams Enabled: true, Default: isDefault, }, + Name: fullVersion, + Type: api.OpenShiftVersionsType, }) } diff --git a/cmd/aro/update_role_sets.go b/cmd/aro/update_role_sets.go index 0abd265cf27..53cfaca41ab 100644 --- a/cmd/aro/update_role_sets.go +++ b/cmd/aro/update_role_sets.go @@ -101,6 +101,8 @@ func updatePlatformWorkloadIdentityRoleSetsInCosmosDB(ctx context.Context, dbPla ID: dbPlatformWorkloadIdentityRoleSets.NewUUID(), PlatformWorkloadIdentityRoleSet: &api.PlatformWorkloadIdentityRoleSet{ Properties: doc, + Name: doc.OpenShiftVersion, + Type: api.PlatformWorkloadIdentityRoleSetsType, }, } diff --git a/pkg/api/admin/openshiftversion.go b/pkg/api/admin/openshiftversion.go index 00e03c2762e..3564b8c846d 100644 --- a/pkg/api/admin/openshiftversion.go +++ b/pkg/api/admin/openshiftversion.go @@ -16,6 +16,9 @@ type OpenShiftVersion struct { // Name of the resource. Name string `json:"name,omitempty"` + // The resource type. + Type string `json:"type,omitempty" mutable:"case"` + // The properties for the OpenShiftVersion resource. Properties OpenShiftVersionProperties `json:"properties,omitempty"` } diff --git a/pkg/api/admin/openshiftversion_convert.go b/pkg/api/admin/openshiftversion_convert.go index 628865ac20d..2c932258be3 100644 --- a/pkg/api/admin/openshiftversion_convert.go +++ b/pkg/api/admin/openshiftversion_convert.go @@ -24,6 +24,14 @@ func (openShiftVersionConverter) ToExternal(v *api.OpenShiftVersion) interface{} }, } + if out.Name != "" { + out.Name = v.Properties.Version + } + + if out.Type != "" { + out.Type = api.OpenShiftVersionsType + } + return out } @@ -52,4 +60,6 @@ func (c openShiftVersionConverter) ToInternal(_new interface{}, out *api.OpenShi out.Properties.InstallerPullspec = new.Properties.InstallerPullspec out.Properties.OpenShiftPullspec = new.Properties.OpenShiftPullspec out.Properties.Version = new.Properties.Version + out.Name = new.Properties.Version + out.Type = api.OpenShiftVersionsType } diff --git a/pkg/api/admin/platformworkloadidentityroleset.go b/pkg/api/admin/platformworkloadidentityroleset.go index cdea759f21e..c3165b05473 100644 --- a/pkg/api/admin/platformworkloadidentityroleset.go +++ b/pkg/api/admin/platformworkloadidentityroleset.go @@ -17,6 +17,9 @@ type PlatformWorkloadIdentityRoleSet struct { // Name of the resource. Name string `json:"name,omitempty" mutable:"case"` + // The resource type. + Type string `json:"type,omitempty" mutable:"case"` + // The properties for the PlatformWorkloadIdentityRoleSet resource. Properties PlatformWorkloadIdentityRoleSetProperties `json:"properties,omitempty"` } diff --git a/pkg/api/admin/platformworkloadidentityroleset_convert.go b/pkg/api/admin/platformworkloadidentityroleset_convert.go index cb8d6ce6ebf..33152d082d4 100644 --- a/pkg/api/admin/platformworkloadidentityroleset_convert.go +++ b/pkg/api/admin/platformworkloadidentityroleset_convert.go @@ -18,6 +18,8 @@ func (c platformWorkloadIdentityRoleSetConverter) ToExternal(s *api.PlatformWork OpenShiftVersion: s.Properties.OpenShiftVersion, PlatformWorkloadIdentityRoles: make([]PlatformWorkloadIdentityRole, 0, len(s.Properties.PlatformWorkloadIdentityRoles)), }, + Name: s.Name, + Type: s.Type, } for _, r := range s.Properties.PlatformWorkloadIdentityRoles { @@ -76,4 +78,6 @@ func (c platformWorkloadIdentityRoleSetConverter) ToInternal(_new interface{}, o out.Properties.PlatformWorkloadIdentityRoles = append(out.Properties.PlatformWorkloadIdentityRoles, role) } + out.Name = new.Properties.OpenShiftVersion + out.Type = api.PlatformWorkloadIdentityRoleSetsType } diff --git a/pkg/api/v20240812preview/openshiftversion_convert.go b/pkg/api/v20240812preview/openshiftversion_convert.go index 4499fc3e7ae..eca6a752779 100644 --- a/pkg/api/v20240812preview/openshiftversion_convert.go +++ b/pkg/api/v20240812preview/openshiftversion_convert.go @@ -21,8 +21,16 @@ func (openShiftVersionConverter) ToExternal(v *api.OpenShiftVersion) interface{} Properties: OpenShiftVersionProperties{ Version: v.Properties.Version, }, - Name: v.Properties.Version, - Type: api.OpenShiftVersionsType, + Name: v.Name, + Type: v.Type, + } + + if out.Name != "" { + out.Name = v.Properties.Version + } + + if out.Type != "" { + out.Type = api.OpenShiftVersionsType } return out @@ -49,4 +57,6 @@ func (c openShiftVersionConverter) ToExternalList(vers []*api.OpenShiftVersion) func (c openShiftVersionConverter) ToInternal(_new interface{}, out *api.OpenShiftVersion) { new := _new.(*OpenShiftVersion) out.Properties.Version = new.Properties.Version + out.Name = new.Properties.Version + out.Type = api.OpenShiftVersionsType } diff --git a/pkg/api/v20240812preview/platformworkloadidentityroleset_convert.go b/pkg/api/v20240812preview/platformworkloadidentityroleset_convert.go index 97a61903baf..ba6c869bb01 100644 --- a/pkg/api/v20240812preview/platformworkloadidentityroleset_convert.go +++ b/pkg/api/v20240812preview/platformworkloadidentityroleset_convert.go @@ -22,8 +22,8 @@ func (c platformWorkloadIdentityRoleSetConverter) ToExternal(s *api.PlatformWork OpenShiftVersion: s.Properties.OpenShiftVersion, PlatformWorkloadIdentityRoles: make([]PlatformWorkloadIdentityRole, 0, len(s.Properties.PlatformWorkloadIdentityRoles)), }, - Name: s.Properties.OpenShiftVersion, - Type: api.PlatformWorkloadIdentityRoleSetsType, + Name: s.Name, + Type: s.Type, } for _, r := range s.Properties.PlatformWorkloadIdentityRoles { @@ -70,4 +70,6 @@ func (c platformWorkloadIdentityRoleSetConverter) ToInternal(_new interface{}, o } out.Properties.PlatformWorkloadIdentityRoles = append(out.Properties.PlatformWorkloadIdentityRoles, role) } + out.Name = new.Properties.OpenShiftVersion + out.Type = api.PlatformWorkloadIdentityRoleSetsType }