Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove unused ClusterManager API structs #4011

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
+1,416 −58,026
Open

Remove unused ClusterManager API structs #4011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e411dbe
remove unused fields in pkg/api
hawkowl Apr 9, 2024
226ccbb
remove from swagger examples+APIs
hawkowl Apr 9, 2024
7e86933
remove api code
hawkowl Jun 24, 2024
6dabce9
remove converter mocks
hawkowl Jun 24, 2024
a87744a
remove operation list entries for clustermanager
hawkowl Jun 24, 2024
20d45cf
remove mock
hawkowl Jun 24, 2024
ea4296d
remove swagger entries for clustermanager
hawkowl Jun 24, 2024
1ea5f01
remove the clusteridentityprovider
hawkowl Dec 13, 2024
bde0ea6
remove fixing the gofmt
hawkowl Dec 13, 2024
ed79d12
regenerate clients
hawkowl Dec 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .sha256sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
b9e1c53e7b02da3eefc7ce684206aaf26bcdea5c57c185abad9c7c6922ba347a swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/openshiftclusters/stable/2020-04-30/redhatopenshift.json
16028ea68957d5444a0ac4799498f167e4fdf75bbbdafff1fb36d0bc826ce34f swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/openshiftclusters/preview/2021-09-01-preview/redhatopenshift.json
a92373b9b2f50ea02b8c21ca930d6809b9c25f90fb8b203c0f5e222e0031a80d swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/openshiftclusters/stable/2022-04-01/redhatopenshift.json
c392d570595aef3f96b1a0510c5fbf99760a3728e0a7826670cb84746d59a507 swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/openshiftclusters/stable/2022-09-04/redhatopenshift.json
695273c782d580c2c0d549c16ad5694cdffc0829c95fe587212afcb79a1e3566 swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/openshiftclusters/stable/2023-04-01/redhatopenshift.json
e9b88ecfecd9c3486341993612ade38fa6a4678f1ae06faa69513655682d39fb swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/openshiftclusters/preview/2023-07-01-preview/redhatopenshift.json
22761c2f004997e339355a93953538ccb8b9954c931cf5296c5108946556ff10 swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/openshiftclusters/stable/2023-09-04/redhatopenshift.json
a04c231ccd66c1a092e3d8e3aad02c2a0880be7643b5c11b42069d39749b8999 swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/openshiftclusters/stable/2023-11-22/redhatopenshift.json
56b12adca2f9fe98053716433a3d6383adeed7dea8f477a58f9f9fbd7178fd3d swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/openshiftclusters/preview/2024-08-12-preview/redhatopenshift.json
7a13a7bf8b957acb9ea8ad305157224b29862605b8db108261f2ff7e511a30bd swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/openshiftclusters/stable/2022-09-04/redhatopenshift.json
247aa1f7f8b6d1fbccd82f19bd3362c833001bc1092a93c74207ecaeb31a0120 swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/openshiftclusters/stable/2023-04-01/redhatopenshift.json
cb2e8aad08818a0a405e49892e5454a1e1ad87a90a1135086ebdf606ee4197fe swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/openshiftclusters/preview/2023-07-01-preview/redhatopenshift.json
052091885db74317e5d60d4045dc2f01c03152690f18242a72656c15f5b326a2 swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/openshiftclusters/stable/2023-09-04/redhatopenshift.json
857df2863c5f0c48c022ade5e16423509896c5b0e66ff0180acaf2370e86b5c8 swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/openshiftclusters/stable/2023-11-22/redhatopenshift.json
b799807450b36202eb0fc95898dfcfd9ff4a22fbc80da45fc5d80f3e9099488c swagger/redhatopenshift/resource-manager/Microsoft.RedHatOpenShift/openshiftclusters/preview/2024-08-12-preview/redhatopenshift.json
2 changes: 0 additions & 2 deletions pkg/api/generate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,3 @@ package api
// Licensed under the Apache License 2.0.

//go:generate enumer -type InstallPhase -output zz_generated_installphase_enumer.go
//go:generate mockgen -destination=../util/mocks/api/api.go github.com/Azure/ARO-RP/pkg/api SyncSetConverter,MachinePoolConverter,SyncIdentityProviderConverter,SecretConverter
//go:generate goimports -local=github.com/Azure/ARO-RP -e -w ../util/mocks/api/api.go
87 changes: 0 additions & 87 deletions pkg/api/operation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,90 +139,3 @@ var OperationListInstallVersions = Operation{
},
Origin: "user,system",
}

var OperationSyncSetsRead = Operation{
Name: "Microsoft.RedHatOpenShift/openShiftClusters/syncSets/read",
Display: Display{
Provider: "Azure Red Hat OpenShift",
Resource: "syncSets",
Operation: "Read OpenShift cluster sync set",
},
Origin: "user,system",
}

var OperationSyncSetsWrite = Operation{
Name: "Microsoft.RedHatOpenShift/openShiftClusters/syncSets/write",
Display: Display{
Provider: "Azure Red Hat OpenShift",
Resource: "syncSets",
Operation: "Write OpenShift cluster sync set",
},
Origin: "user,system",
}

var OperationSyncSetsDelete = Operation{
Name: "Microsoft.RedHatOpenShift/openShiftClusters/syncSets/delete",
Display: Display{
Provider: "Azure Red Hat OpenShift",
Resource: "syncSets",
Operation: "Delete OpenShift cluster sync set",
},
Origin: "user,system",
}

var OperationMachinePoolsRead = Operation{
Name: "Microsoft.RedHatOpenShift/openShiftClusters/machinePools/read",
Display: Display{
Provider: "Azure Red Hat OpenShift",
Resource: "machinePools",
Operation: "Read OpenShift cluster machine pool",
},
Origin: "user,system",
}
var OperationMachinePoolsWrite = Operation{
Name: "Microsoft.RedHatOpenShift/openShiftClusters/machinePools/write",
Display: Display{
Provider: "Azure Red Hat OpenShift",
Resource: "machinePools",
Operation: "Write OpenShift cluster machine pool",
},
Origin: "user,system",
}
var OperationMachinePoolsDelete = Operation{
Name: "Microsoft.RedHatOpenShift/openShiftClusters/machinePools/delete",
Display: Display{
Provider: "Azure Red Hat OpenShift",
Resource: "machinePools",
Operation: "Delete OpenShift cluster machine pool",
},
Origin: "user,system",
}

var OperationSyncIdentityProvidersRead = Operation{
Name: "Microsoft.RedHatOpenShift/openShiftClusters/syncIdentityProviders/read",
Display: Display{
Provider: "Azure Red Hat OpenShift",
Resource: "syncIdentityProviders",
Operation: "Read OpenShift cluster sync identity provider",
},
Origin: "user,system",
}
var OperationSyncIdentityProvidersWrite = Operation{
Name: "Microsoft.RedHatOpenShift/openShiftClusters/syncIdentityProviders/write",
Display: Display{
Provider: "Azure Red Hat OpenShift",
Resource: "syncIdentityProviders",
Operation: "Write OpenShift cluster sync identity provider",
},
Origin: "user,system",
}

var OperationSyncIdentityProvidersDelete = Operation{
Name: "Microsoft.RedHatOpenShift/openShiftClusters/syncIdentityProviders/delete",
Display: Display{
Provider: "Azure Red Hat OpenShift",
Resource: "syncIdentityProviders",
Operation: "Delete OpenShift cluster sync identity provider",
},
Origin: "user,system",
}
33 changes: 0 additions & 33 deletions pkg/api/register.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@ type OpenShiftClusterStaticValidator interface {
Static(interface{}, *OpenShiftCluster, string, string, bool, string) error
}

type ClusterManagerStaticValidator interface {
Static(string, string) error
}

type OpenShiftClusterCredentialsConverter interface {
ToExternal(*OpenShiftCluster) interface{}
}
Expand Down Expand Up @@ -47,30 +43,6 @@ type PlatformWorkloadIdentityRoleSetStaticValidator interface {
Static(interface{}, *PlatformWorkloadIdentityRoleSet) error
}

type SyncSetConverter interface {
ToExternal(*SyncSet) interface{}
ToExternalList([]*SyncSet) interface{}
ToInternal(interface{}, *SyncSet)
}

type MachinePoolConverter interface {
ToExternal(*MachinePool) interface{}
ToExternalList([]*MachinePool) interface{}
ToInternal(interface{}, *MachinePool)
}

type SyncIdentityProviderConverter interface {
ToExternal(*SyncIdentityProvider) interface{}
ToExternalList([]*SyncIdentityProvider) interface{}
ToInternal(interface{}, *SyncIdentityProvider)
}

type SecretConverter interface {
ToExternal(*Secret) interface{}
ToExternalList([]*Secret) interface{}
ToInternal(interface{}, *Secret)
}

type MaintenanceManifestConverter interface {
ToExternal(doc *MaintenanceManifestDocument, clusterNamespaced bool) interface{}
ToExternalList(docs []*MaintenanceManifestDocument, nextLink string, clusterNamespaced bool) interface{}
Expand All @@ -92,11 +64,6 @@ type Version struct {
PlatformWorkloadIdentityRoleSetConverter PlatformWorkloadIdentityRoleSetConverter
PlatformWorkloadIdentityRoleSetStaticValidator PlatformWorkloadIdentityRoleSetStaticValidator
OperationList OperationList
SyncSetConverter SyncSetConverter
MachinePoolConverter MachinePoolConverter
SyncIdentityProviderConverter SyncIdentityProviderConverter
SecretConverter SecretConverter
ClusterManagerStaticValidator ClusterManagerStaticValidator
MaintenanceManifestConverter MaintenanceManifestConverter
MaintenanceManifestStaticValidator MaintenanceManifestStaticValidator
}
Expand Down
154 changes: 0 additions & 154 deletions pkg/api/v20220904/clustermanager.go
View file
Open in desktop

This file was deleted.

37 changes: 0 additions & 37 deletions pkg/api/v20220904/clustermanager_validatestatic.go
View file
Open in desktop

This file was deleted.

Loading
Loading