conflict fix

ankasoftco · Aug 29, 2023 · 51b2a1a · 51b2a1a
1 parent b3cd3e2
commit 51b2a1a
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 10 deletions.
diff --git a/apis/zz_register.go b/apis/zz_register.go
diff --git a/config/external_name.go b/config/external_name.go
@@ -10,13 +10,15 @@ import "github.com/upbound/upjet/pkg/config"
 // provider.
 var ExternalNameConfigs = map[string]config.ExternalName{
 	// Import requires using a randomly generated ID from provider: nl-2e21sda
-	"vra_project": config.IdentifierFromProvider,
-	"vra_blueprint": config.IdentifierFromProvider,
-	"vra_blueprint_version": config.IdentifierFromProvider,
-	"vra_deployment": config.IdentifierFromProvider,
-	"vra_fabric_compute": config.IdentifierFromProvider,
-	"vra_datastore_vsphere": config.IdentifierFromProvider,
-	"vra_network_vsphere": config.IdentifierFromProvider,
+	"vra_project":               config.IdentifierFromProvider,
+	"vra_blueprint":             config.IdentifierFromProvider,
+	"vra_blueprint_version":     config.IdentifierFromProvider,
+	"vra_deployment":            config.IdentifierFromProvider,
+	"vra_fabric_compute":        config.IdentifierFromProvider,
+	"vra_datastore_vsphere":     config.IdentifierFromProvider,
+	"vra_network_vsphere":       config.IdentifierFromProvider,
+	"vra_block_device":          config.IdentifierFromProvider,
+	"vra_block_device_snapshot": config.IdentifierFromProvider,
 }
 
 // ExternalNameConfigurations applies all external name configs listed in the

diff --git a/config/provider.go b/config/provider.go
@@ -8,12 +8,17 @@ import (
 	// Note(turkenh): we are importing this to embed provider schema document
 	_ "embed"
 
+	blockDevice "github.com/ankasoftco/upjet-provider-vra/config/block_device"
+
 	ujconfig "github.com/upbound/upjet/pkg/config"
 
-	project "github.com/ankasoftco/upjet-provider-vra/config/project"
 	blueprint "github.com/ankasoftco/upjet-provider-vra/config/blueprint"
 	deployment "github.com/ankasoftco/upjet-provider-vra/config/deployment"
+<<<<<<< HEAD
 	fabric "github.com/ankasoftco/upjet-provider-vra/config/fabric"
+=======
+	project "github.com/ankasoftco/upjet-provider-vra/config/project"
+>>>>>>> a5278da (block device and block device snapshot added)
 )
 
 const (
@@ -43,6 +48,8 @@ func GetProvider() *ujconfig.Provider {
 		blueprint.Configure,	
 		deployment.Configure,
 		fabric.Configure,
+		blockDevice.Configure,
+		blockDeviceSnapshot.Configure,
 	} {
 		configure(pc)
 	}

diff --git a/internal/controller/zz_setup.go b/internal/controller/zz_setup.go
@@ -9,6 +9,8 @@ import (
 
 	"github.com/upbound/upjet/pkg/controller"
 
+	blockdevice "github.com/ankasoftco/upjet-provider-vra/internal/controller/blockdevice/blockdevice"
+	blockdevicesnapshot "github.com/ankasoftco/upjet-provider-vra/internal/controller/blockdevice/blockdevicesnapshot"
 	blueprint "github.com/ankasoftco/upjet-provider-vra/internal/controller/blueprint/blueprint"
 	version "github.com/ankasoftco/upjet-provider-vra/internal/controller/blueprint/version"
 	deployment "github.com/ankasoftco/upjet-provider-vra/internal/controller/deployment/deployment"
@@ -21,6 +23,8 @@ import (
 // the supplied manager.
 func Setup(mgr ctrl.Manager, o controller.Options) error {
 	for _, setup := range []func(ctrl.Manager, controller.Options) error{
+		blockdevice.Setup,
+		blockdevicesnapshot.Setup,
 		blueprint.Setup,
 		version.Setup,
 		deployment.Setup,