Skip to content

Commit

Permalink
revert naming openShiftCluster.ManagedServiceIdentity to Identity
Browse files Browse the repository at this point in the history
  • Loading branch information
@cadenmarchese
cadenmarchese committed Oct 8, 2024
1 parent e7e466f commit c0ca919
Show file tree
Hide file tree
Showing 16 changed files with 120 additions and 120 deletions.
14 changes: 7 additions & 7 deletions pkg/api/admin/openshiftcluster.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ type OpenShiftClusterList struct {

// OpenShiftCluster represents an Azure Red Hat OpenShift cluster.
type OpenShiftCluster struct {
ID string `json:"id,omitempty" mutable:"case"`
Name string `json:"name,omitempty" mutable:"case"`
Type string `json:"type,omitempty" mutable:"case"`
Location string `json:"location,omitempty"`
Tags map[string]string `json:"tags,omitempty"`
Properties OpenShiftClusterProperties `json:"properties,omitempty"`
ManagedServiceIdentity *ManagedServiceIdentity `json:"managedServiceIdentity,omitempty"`
ID string `json:"id,omitempty" mutable:"case"`
Name string `json:"name,omitempty" mutable:"case"`
Type string `json:"type,omitempty" mutable:"case"`
Location string `json:"location,omitempty"`
Tags map[string]string `json:"tags,omitempty"`
Properties OpenShiftClusterProperties `json:"properties,omitempty"`
Identity *ManagedServiceIdentity `json:"managedServiceIdentity,omitempty"`
}

// OpenShiftClusterProperties represents an OpenShift cluster's properties.
Expand Down
36 changes: 18 additions & 18 deletions pkg/api/admin/openshiftcluster_convert.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,14 +177,14 @@ func (c openShiftClusterConverter) ToExternal(oc *api.OpenShiftCluster) interfac
}
}

if oc.ManagedServiceIdentity != nil {
out.ManagedServiceIdentity.Type = ManagedServiceIdentityType(oc.ManagedServiceIdentity.Type)
out.ManagedServiceIdentity.UserAssignedIdentities = make(map[string]UserAssignedIdentity, len(oc.ManagedServiceIdentity.UserAssignedIdentities))
for k := range oc.ManagedServiceIdentity.UserAssignedIdentities {
if oc.Identity != nil {
out.Identity.Type = ManagedServiceIdentityType(oc.Identity.Type)
out.Identity.UserAssignedIdentities = make(map[string]UserAssignedIdentity, len(oc.Identity.UserAssignedIdentities))
for k := range oc.Identity.UserAssignedIdentities {
var temp UserAssignedIdentity
temp.ClientID = oc.ManagedServiceIdentity.UserAssignedIdentities[k].ClientID
temp.PrincipalID = oc.ManagedServiceIdentity.UserAssignedIdentities[k].PrincipalID
out.ManagedServiceIdentity.UserAssignedIdentities[k] = temp
temp.ClientID = oc.Identity.UserAssignedIdentities[k].ClientID
temp.PrincipalID = oc.Identity.UserAssignedIdentities[k].PrincipalID
out.Identity.UserAssignedIdentities[k] = temp
}
}

Expand Down Expand Up @@ -256,14 +256,14 @@ func (c openShiftClusterConverter) ToInternal(_oc interface{}, out *api.OpenShif
out.Tags[k] = v
}
}
if oc.ManagedServiceIdentity != nil {
out.ManagedServiceIdentity.Type = api.ManagedServiceIdentityType(oc.ManagedServiceIdentity.Type)
out.ManagedServiceIdentity.UserAssignedIdentities = make(map[string]api.UserAssignedIdentity, len(oc.ManagedServiceIdentity.UserAssignedIdentities))
for k := range oc.ManagedServiceIdentity.UserAssignedIdentities {
if oc.Identity != nil {
out.Identity.Type = api.ManagedServiceIdentityType(oc.Identity.Type)
out.Identity.UserAssignedIdentities = make(map[string]api.UserAssignedIdentity, len(oc.Identity.UserAssignedIdentities))
for k := range oc.Identity.UserAssignedIdentities {
var temp api.UserAssignedIdentity
temp.ClientID = oc.ManagedServiceIdentity.UserAssignedIdentities[k].ClientID
temp.PrincipalID = oc.ManagedServiceIdentity.UserAssignedIdentities[k].PrincipalID
out.ManagedServiceIdentity.UserAssignedIdentities[k] = temp
temp.ClientID = oc.Identity.UserAssignedIdentities[k].ClientID
temp.PrincipalID = oc.Identity.UserAssignedIdentities[k].PrincipalID
out.Identity.UserAssignedIdentities[k] = temp
}
}
out.Properties.ArchitectureVersion = api.ArchitectureVersion(oc.Properties.ArchitectureVersion)
Expand Down Expand Up @@ -433,12 +433,12 @@ func (c openShiftClusterConverter) ExternalNoReadOnly(_oc interface{}) {
}
}
}
if oc.ManagedServiceIdentity != nil {
for i := range oc.ManagedServiceIdentity.UserAssignedIdentities {
if entry, ok := oc.ManagedServiceIdentity.UserAssignedIdentities[i]; ok {
if oc.Identity != nil {
for i := range oc.Identity.UserAssignedIdentities {
if entry, ok := oc.Identity.UserAssignedIdentities[i]; ok {
entry.ClientID = ""
entry.PrincipalID = ""
oc.ManagedServiceIdentity.UserAssignedIdentities[i] = entry
oc.Identity.UserAssignedIdentities[i] = entry
}
}
}
Expand Down
22 changes: 11 additions & 11 deletions pkg/api/openshiftcluster.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ type OpenShiftCluster struct {

// ID, Name and Type are cased as the user provided them at create time.
// ID, Name, Type and Location are immutable.
ID string `json:"id,omitempty"`
Name string `json:"name,omitempty"`
Type string `json:"type,omitempty"`
Location string `json:"location,omitempty"`
SystemData SystemData `json:"systemData,omitempty"`
Tags map[string]string `json:"tags,omitempty"`
Properties OpenShiftClusterProperties `json:"properties,omitempty"`
ManagedServiceIdentity *ManagedServiceIdentity `json:"managedServiceIdentity,omitempty"`
ID string `json:"id,omitempty"`
Name string `json:"name,omitempty"`
Type string `json:"type,omitempty"`
Location string `json:"location,omitempty"`
SystemData SystemData `json:"systemData,omitempty"`
Tags map[string]string `json:"tags,omitempty"`
Properties OpenShiftClusterProperties `json:"properties,omitempty"`
Identity *ManagedServiceIdentity `json:"managedServiceIdentity,omitempty"`

//this property is used in the enrichers. Should not be marshalled
Lock sync.Mutex `json:"-"`
Expand All @@ -42,12 +42,12 @@ func (oc *OpenShiftCluster) UsesWorkloadIdentity() bool {
func (oc *OpenShiftCluster) ClusterMsiResourceId() (*arm.ResourceID, error) {
if !oc.HasUserAssignedIdentities() {
return nil, errors.New("could not find cluster MSI in cluster doc")
} else if len(oc.ManagedServiceIdentity.UserAssignedIdentities) > 1 {
} else if len(oc.Identity.UserAssignedIdentities) > 1 {
return nil, errors.New("unexpectedly found more than one cluster MSI in cluster doc")
}

var msiResourceId string
for resourceId := range oc.ManagedServiceIdentity.UserAssignedIdentities {
for resourceId := range oc.Identity.UserAssignedIdentities {
msiResourceId = resourceId
}

Expand All @@ -57,7 +57,7 @@ func (oc *OpenShiftCluster) ClusterMsiResourceId() (*arm.ResourceID, error) {
// HasUserAssignedIdentities returns true if and only if the cluster doc's
// Identity.UserAssignedIdentities is non-nil and non-empty.
func (oc *OpenShiftCluster) HasUserAssignedIdentities() bool {
return oc.ManagedServiceIdentity != nil && oc.ManagedServiceIdentity.UserAssignedIdentities != nil && len(oc.ManagedServiceIdentity.UserAssignedIdentities) > 0
return oc.Identity != nil && oc.Identity.UserAssignedIdentities != nil && len(oc.Identity.UserAssignedIdentities) > 0
}

// CreatedByType by defines user type, which executed the request
Expand Down
14 changes: 7 additions & 7 deletions pkg/api/openshiftcluster_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,14 +134,14 @@ func TestClusterMsiResourceId(t *testing.T) {
{
name: "error - cluster doc has non-nil ManagedServiceIdentity but nil ManagedServiceIdentity.UserAssignedIdentities",
oc: &OpenShiftCluster{
ManagedServiceIdentity: &ManagedServiceIdentity{},
Identity: &ManagedServiceIdentity{},
},
wantErr: "could not find cluster MSI in cluster doc",
},
{
name: "error - cluster doc has non-nil ManagedServiceIdentity but empty ManagedServiceIdentity.UserAssignedIdentities",
oc: &OpenShiftCluster{
ManagedServiceIdentity: &ManagedServiceIdentity{
Identity: &ManagedServiceIdentity{
UserAssignedIdentities: map[string]UserAssignedIdentity{},
},
},
Expand All @@ -150,7 +150,7 @@ func TestClusterMsiResourceId(t *testing.T) {
{
name: "error - cluster doc has non-nil Identity but two MSIs in Identity.UserAssignedIdentities",
oc: &OpenShiftCluster{
ManagedServiceIdentity: &ManagedServiceIdentity{
Identity: &ManagedServiceIdentity{
UserAssignedIdentities: map[string]UserAssignedIdentity{
miResourceId: {
ClientID: "",
Expand All @@ -168,7 +168,7 @@ func TestClusterMsiResourceId(t *testing.T) {
{
name: "success",
oc: &OpenShiftCluster{
ManagedServiceIdentity: &ManagedServiceIdentity{
Identity: &ManagedServiceIdentity{
UserAssignedIdentities: map[string]UserAssignedIdentity{
miResourceId: {
ClientID: "",
Expand Down Expand Up @@ -210,14 +210,14 @@ func TestHasUserAssignedIdentities(t *testing.T) {
{
name: "false - cluster doc has non-nil Identity but nil Identity.UserAssignedIdentities",
oc: &OpenShiftCluster{
ManagedServiceIdentity: &ManagedServiceIdentity{},
Identity: &ManagedServiceIdentity{},
},
wantResult: false,
},
{
name: "false - cluster doc has non-nil Identity but empty Identity.UserAssignedIdentities",
oc: &OpenShiftCluster{
ManagedServiceIdentity: &ManagedServiceIdentity{
Identity: &ManagedServiceIdentity{
UserAssignedIdentities: map[string]UserAssignedIdentity{},
},
},
Expand All @@ -226,7 +226,7 @@ func TestHasUserAssignedIdentities(t *testing.T) {
{
name: "true",
oc: &OpenShiftCluster{
ManagedServiceIdentity: &ManagedServiceIdentity{
Identity: &ManagedServiceIdentity{
UserAssignedIdentities: map[string]UserAssignedIdentity{
miResourceId: {},
},
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/v20240812preview/openshiftcluster.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ type OpenShiftCluster struct {
Properties OpenShiftClusterProperties `json:"properties,omitempty"`

// Identity stores information about the cluster MSI(s) in a workload identity cluster.
ManagedServiceIdentity *ManagedServiceIdentity `json:"managedServiceIdentity,omitempty"`
Identity *ManagedServiceIdentity `json:"managedServiceIdentity,omitempty"`
}

// UsesWorkloadIdentity checks whether a cluster is a Workload Identity cluster or a Service Principal cluster
Expand Down
40 changes: 20 additions & 20 deletions pkg/api/v20240812preview/openshiftcluster_convert.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,15 +128,15 @@ func (c openShiftClusterConverter) ToExternal(oc *api.OpenShiftCluster) interfac
}
}

if oc.ManagedServiceIdentity != nil {
out.ManagedServiceIdentity = &ManagedServiceIdentity{}
out.ManagedServiceIdentity.Type = ManagedServiceIdentityType(oc.ManagedServiceIdentity.Type)
out.ManagedServiceIdentity.UserAssignedIdentities = make(map[string]UserAssignedIdentity, len(oc.ManagedServiceIdentity.UserAssignedIdentities))
for k := range oc.ManagedServiceIdentity.UserAssignedIdentities {
if oc.Identity != nil {
out.Identity = &ManagedServiceIdentity{}
out.Identity.Type = ManagedServiceIdentityType(oc.Identity.Type)
out.Identity.UserAssignedIdentities = make(map[string]UserAssignedIdentity, len(oc.Identity.UserAssignedIdentities))
for k := range oc.Identity.UserAssignedIdentities {
var temp UserAssignedIdentity
temp.ClientID = oc.ManagedServiceIdentity.UserAssignedIdentities[k].ClientID
temp.PrincipalID = oc.ManagedServiceIdentity.UserAssignedIdentities[k].PrincipalID
out.ManagedServiceIdentity.UserAssignedIdentities[k] = temp
temp.ClientID = oc.Identity.UserAssignedIdentities[k].ClientID
temp.PrincipalID = oc.Identity.UserAssignedIdentities[k].PrincipalID
out.Identity.UserAssignedIdentities[k] = temp
}
}

Expand Down Expand Up @@ -211,15 +211,15 @@ func (c openShiftClusterConverter) ToInternal(_oc interface{}, out *api.OpenShif
}
}

if oc.ManagedServiceIdentity != nil {
out.ManagedServiceIdentity = &api.ManagedServiceIdentity{}
out.ManagedServiceIdentity.Type = api.ManagedServiceIdentityType(oc.ManagedServiceIdentity.Type)
out.ManagedServiceIdentity.UserAssignedIdentities = make(map[string]api.UserAssignedIdentity, len(oc.ManagedServiceIdentity.UserAssignedIdentities))
for k := range oc.ManagedServiceIdentity.UserAssignedIdentities {
if oc.Identity != nil {
out.Identity = &api.ManagedServiceIdentity{}
out.Identity.Type = api.ManagedServiceIdentityType(oc.Identity.Type)
out.Identity.UserAssignedIdentities = make(map[string]api.UserAssignedIdentity, len(oc.Identity.UserAssignedIdentities))
for k := range oc.Identity.UserAssignedIdentities {
var temp api.UserAssignedIdentity
temp.ClientID = oc.ManagedServiceIdentity.UserAssignedIdentities[k].ClientID
temp.PrincipalID = oc.ManagedServiceIdentity.UserAssignedIdentities[k].PrincipalID
out.ManagedServiceIdentity.UserAssignedIdentities[k] = temp
temp.ClientID = oc.Identity.UserAssignedIdentities[k].ClientID
temp.PrincipalID = oc.Identity.UserAssignedIdentities[k].PrincipalID
out.Identity.UserAssignedIdentities[k] = temp
}
}

Expand Down Expand Up @@ -373,12 +373,12 @@ func (c openShiftClusterConverter) ExternalNoReadOnly(_oc interface{}) {
}
}
}
if oc.ManagedServiceIdentity != nil {
for i := range oc.ManagedServiceIdentity.UserAssignedIdentities {
if entry, ok := oc.ManagedServiceIdentity.UserAssignedIdentities[i]; ok {
if oc.Identity != nil {
for i := range oc.Identity.UserAssignedIdentities {
if entry, ok := oc.Identity.UserAssignedIdentities[i]; ok {
entry.ClientID = ""
entry.PrincipalID = ""
oc.ManagedServiceIdentity.UserAssignedIdentities[i] = entry
oc.Identity.UserAssignedIdentities[i] = entry
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/v20240812preview/openshiftcluster_example.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ func ExampleOpenShiftClusterPutParameter() interface{} {
oc.ID = ""
oc.Name = ""
oc.Type = ""
oc.ManagedServiceIdentity = &ManagedServiceIdentity{
oc.Identity = &ManagedServiceIdentity{
Type: "",
UserAssignedIdentities: map[string]UserAssignedIdentity{},
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/api/v20240812preview/openshiftcluster_validatestatic.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -506,14 +506,14 @@ func (sv openShiftClusterStaticValidator) validatePlatformIdentities(oc *OpenShi
return api.NewCloudError(http.StatusBadRequest, api.CloudErrorCodeInvalidParameter, "properties.servicePrincipalProfile", "Cannot use identities and service principal credentials at the same time.")
}

clusterIdentityPresent := oc.ManagedServiceIdentity != nil
clusterIdentityPresent := oc.Identity != nil
operatorRolePresent := pwip != nil

if clusterIdentityPresent != operatorRolePresent {
return api.NewCloudError(http.StatusBadRequest, api.CloudErrorCodeInvalidParameter, "identity", "Cluster identity and platform workload identities require each other.")
}

if operatorRolePresent && len(oc.ManagedServiceIdentity.UserAssignedIdentities) != 1 {
if operatorRolePresent && len(oc.Identity.UserAssignedIdentities) != 1 {
return api.NewCloudError(http.StatusBadRequest, api.CloudErrorCodeInvalidParameter, "identity", "The provided cluster identity is invalid; there should be exactly one.")
}

Expand Down
Loading

0 comments on commit c0ca919

Please sign in to comment.