chore: remove unneeded upconfig.WithBasePackages

Signed-off-by: Marques Johansson <[email protected]>
crossplane-contrib · Jul 29, 2024 · caad3ab · caad3ab
1 parent c11c09b
commit caad3ab
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 17 deletions.
diff --git a/apis/zz_register.go b/apis/zz_register.go
diff --git a/config/provider.go b/config/provider.go
@@ -78,6 +78,12 @@ func GetProvider(_ context.Context, generationProvider bool) (*upconfig.Provider
 	fwProvider := framework.CreateFrameworkProvider(version.ProviderVersion)
 
 	pc := upconfig.NewProvider([]byte(providerSchema), resourcePrefix, modulePath, []byte(providerMetadata),
+		upconfig.WithDefaultResourceOptions(
+			KnownReferencers(),
+			IdentifierAssignedByEquinix(),
+			SkipOptCompLateInitialization(),
+			LongProvision(), // TODO: use this only for Device and other long-provisioning resources
+		),
 		upconfig.WithShortName(resourcePrefix),
 		upconfig.WithRootGroup("equinix.jet.crossplane.io"),
 		upconfig.WithIncludeList([]string{
@@ -92,22 +98,6 @@ func GetProvider(_ context.Context, generationProvider bool) (*upconfig.Provider
 		// upconfig.WithSkipList([]string{".*"}), // helpful when debugging to minimize the number of resources
 		// config.WithTerraformPluginSDKIncludeList(resourceList(terraformSDKIncludeList)),
 		// config.WithTerraformPluginFrameworkIncludeList(resourceList(terraformPluginFrameworkExternalNameConfigs)),
-		upconfig.WithDefaultResourceOptions(
-			KnownReferencers(),
-			IdentifierAssignedByEquinix(),
-			SkipOptCompLateInitialization(),
-			LongProvision(), // TODO: use this only for Device and other long-provisioning resources
-		),
-		upconfig.WithBasePackages(upconfig.BasePackages{
-			APIVersion: []string{
-				// Default package for ProviderConfig APIs
-				"apis/v1beta1",
-			},
-			Controller: []string{
-				// Default package for ProviderConfig controllers
-				"internal/controller/providerconfig",
-			},
-		}),
 	)
 
 	for _, configure := range []func(provider *upconfig.Provider){

diff --git a/package/crds/equinix.jet.crossplane.io_providerconfigusages.yaml b/package/crds/equinix.jet.crossplane.io_providerconfigusages.yaml
@@ -10,7 +10,7 @@ spec:
   names:
     categories:
     - crossplane
-    - provider
+    - providerconfig
     - equinix
     kind: ProviderConfigUsage
     listKind: ProviderConfigUsageList