caa: Move provider inclusion out of cloudmgr

Move the init code to each provider's manager, and include
the provider packages, at the cmd level instead.

Signed-off-by: James Tumber <james.tumber@ibm.com>

cmd/cloud-api-adaptor/aws.go

@@ -0,0 +1,10 @@
+//go:build aws
+
+// (C) Copyright Confidential Containers Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+package main
+
+import (
+	_ "github.com/confidential-containers/cloud-api-adaptor/pkg/adaptor/cloud/aws"
+)

cmd/cloud-api-adaptor/azure.go

@@ -0,0 +1,10 @@
+//go:build azure
+
+// (C) Copyright Confidential Containers Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+package main
+
+import (
+	_ "github.com/confidential-containers/cloud-api-adaptor/pkg/adaptor/cloud/azure"
+)

cmd/cloud-api-adaptor/ibmcloud.go

@@ -0,0 +1,10 @@
+//go:build ibmcloud
+
+// (C) Copyright Confidential Containers Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+package main
+
+import (
+	_ "github.com/confidential-containers/cloud-api-adaptor/pkg/adaptor/cloud/ibmcloud"
+)

cmd/cloud-api-adaptor/ibmcloud_powervs.go

@@ -0,0 +1,10 @@
+//go:build ibmcloud_powervs
+
+// (C) Copyright Confidential Containers Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+package main
+
+import (
+	_ "github.com/confidential-containers/cloud-api-adaptor/pkg/adaptor/cloud/ibmcloud-powervs"
+)

cmd/cloud-api-adaptor/libvirt.go

@@ -0,0 +1,10 @@
+//go:build libvirt
+
+// (C) Copyright Confidential Containers Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+package main
+
+import (
+	_ "github.com/confidential-containers/cloud-api-adaptor/pkg/adaptor/cloud/libvirt"
+)

cmd/cloud-api-adaptor/main.go

@@ -12,7 +12,7 @@ import (
 
 	"github.com/confidential-containers/cloud-api-adaptor/cmd"
 	"github.com/confidential-containers/cloud-api-adaptor/pkg/adaptor"
-	"github.com/confidential-containers/cloud-api-adaptor/pkg/adaptor/cloud/cloudmgr"
+	"github.com/confidential-containers/cloud-api-adaptor/pkg/adaptor/cloud"
 	"github.com/confidential-containers/cloud-api-adaptor/pkg/adaptor/proxy"
 	daemon "github.com/confidential-containers/cloud-api-adaptor/pkg/forwarder"
 	"github.com/confidential-containers/cloud-api-adaptor/pkg/podnetwork/tunneler/vxlan"
@@ -41,7 +41,7 @@ func printHelp(out io.Writer) {
 	fmt.Fprintln(out)
 	fmt.Fprintln(out, "Supported cloud providers are:")
 
-	for _, name := range cloudmgr.List() {
+	for _, name := range cloud.List() {
 		fmt.Fprintf(out, "\t%s\n", name)
 	}
 	fmt.Fprintln(out)
@@ -74,7 +74,7 @@ func (cfg *daemonConfig) Setup() (cmd.Starter, error) {
 		cmd.Exit(1)
 	}
 
-	cloud := cloudmgr.Get(cloudName)
+	cloud := cloud.Get(cloudName)
 
 	if cloud == nil {
 		fmt.Fprintf(os.Stderr, "%s: Unsupported cloud provider: %s\n\n", programName, cloudName)

cmd/cloud-api-adaptor/vsphere.go

@@ -0,0 +1,10 @@
+//go:build vsphere
+
+// (C) Copyright Confidential Containers Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+package main
+
+import (
+	_ "github.com/confidential-containers/cloud-api-adaptor/pkg/adaptor/cloud/vsphere"
+)