fixup! ♻️ refacto: switch to SDKv3

Author: jfbus

…troller-manager/osc/cloud/annotations.go ccm/cloud/annotations.gocloud-controller-manager/osc/cloud/annotations.go renamed to ccm/cloud/annotations.go cloud-controller-manager/osc/cloud/annotations.go renamed to ccm/cloud/annotations.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/outscale/cloud-provider-osc/cloud-controller-manager/osc/oapi"
+	"github.com/outscale/cloud-provider-osc/ccm/oapi"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	clientset "k8s.io/client-go/kubernetes"
 	"k8s.io/klog/v2"

…ud-controller-manager/osc/cloud/cloud.go ccm/cloud/cloud.gocloud-controller-manager/osc/cloud/cloud.go renamed to ccm/cloud/cloud.go cloud-controller-manager/osc/cloud/cloud.go renamed to ccm/cloud/cloud.go

@@ -16,7 +16,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/elb"
 	"github.com/go-viper/mapstructure/v2"
-	"github.com/outscale/cloud-provider-osc/cloud-controller-manager/osc/oapi"
+	"github.com/outscale/cloud-provider-osc/ccm/oapi"
 	"github.com/outscale/osc-sdk-go/v3/pkg/osc"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/util/sets"

…roller-manager/osc/cloud/loadbalancer.go ccm/cloud/loadbalancer.gocloud-controller-manager/osc/cloud/loadbalancer.go renamed to ccm/cloud/loadbalancer.go cloud-controller-manager/osc/cloud/loadbalancer.go renamed to ccm/cloud/loadbalancer.go

@@ -3,7 +3,7 @@ package cloud_test
 import (
 	"testing"
 
-	"github.com/outscale/cloud-provider-osc/cloud-controller-manager/osc/cloud"
+	"github.com/outscale/cloud-provider-osc/ccm/cloud"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	v1 "k8s.io/api/core/v1"

…er/osc/cloud/loadbalancer_config_test.go ccm/cloud/loadbalancer_config_test.gocloud-controller-manager/osc/cloud/loadbalancer_config_test.go renamed to ccm/cloud/loadbalancer_config_test.go cloud-controller-manager/osc/cloud/loadbalancer_config_test.go renamed to ccm/cloud/loadbalancer_config_test.go

@@ -82,11 +82,11 @@ func (vm *VM) NodeAddresses() []v1.NodeAddress {
 }
 
 func (vm *VM) IsStopped() bool {
-	return vm.cloudVm.State == "stopped"
+	return vm.cloudVm.State == osc.VmStateStopped
 }
 
 func (vm *VM) IsTerminated() bool {
-	return vm.cloudVm.State == "terminated"
+	return vm.cloudVm.State == osc.VmStateTerminated
 }
 
 // InstanceID returns the instance ID
@@ -129,12 +129,12 @@ func (c *Cloud) GetVMsByNodeName(ctx context.Context, nodeNames ...string) ([]VM
 	sdkVMs, err := c.api.OAPI().ReadVms(ctx, osc.ReadVmsRequest{
 		Filters: &osc.FiltersVm{
 			TagKeys: &[]string{clusterIDTagKey(c.clusterID)},
-			VmStateNames: &[]string{
-				"pending",
-				"running",
-				"stopping",
-				"stopped",
-				"shutting-down",
+			VmStateNames: &[]osc.VmState{
+				osc.VmStatePending,
+				osc.VmStateRunning,
+				osc.VmStateStopping,
+				osc.VmStateStopped,
+				osc.VmStateShuttingDown,
 			},
 		},
 	})

…oud-controller-manager/osc/cloud/tags.go ccm/cloud/tags.gocloud-controller-manager/osc/cloud/tags.go renamed to ccm/cloud/tags.go cloud-controller-manager/osc/cloud/tags.go renamed to ccm/cloud/tags.go

@@ -29,7 +29,7 @@ import (
 	"io"
 	"os"
 
-	osc "github.com/outscale/cloud-provider-osc/cloud-controller-manager/osc"
+	osc "github.com/outscale/cloud-provider-osc/ccm"
 	"k8s.io/apimachinery/pkg/util/wait"
 	cloudprovider "k8s.io/cloud-provider"
 	"k8s.io/cloud-provider/app"

…ud-controller-manager/osc/cloud/utils.go ccm/cloud/utils.gocloud-controller-manager/osc/cloud/utils.go renamed to ccm/cloud/utils.go cloud-controller-manager/osc/cloud/utils.go renamed to ccm/cloud/utils.go

@@ -1,12 +1,13 @@
-package osc_test
+package ccm_test
 
 import (
 	"testing"
 
 	"github.com/aws/aws-sdk-go/service/elb"
-	"github.com/outscale/cloud-provider-osc/cloud-controller-manager/osc/cloud"
-	"github.com/outscale/cloud-provider-osc/cloud-controller-manager/osc/oapi"
-	oapimocks "github.com/outscale/cloud-provider-osc/cloud-controller-manager/osc/oapi/mocks"
+	"github.com/outscale/cloud-provider-osc/ccm/cloud"
+	"github.com/outscale/cloud-provider-osc/ccm/oapi"
+	oapimocks "github.com/outscale/cloud-provider-osc/ccm/oapi/mocks"
+	"github.com/outscale/osc-sdk-go/v3/pkg/osc"
 	sdk "github.com/outscale/osc-sdk-go/v3/pkg/osc"
 	"go.uber.org/mock/gomock"
 	v1 "k8s.io/api/core/v1"
@@ -52,7 +53,7 @@ var (
 		SubnetId:       ptr.To("subnet-bar"),
 		NetId:          ptr.To("net-bar"),
 		SecurityGroups: []sdk.SecurityGroupLight{{SecurityGroupId: "sg-worker"}, {SecurityGroupId: "sg-node"}},
-		State:          "running",
+		State:          osc.VmStateRunning,
 	}
 	vmNode = v1.Node{
 		ObjectMeta: metav1.ObjectMeta{
@@ -73,7 +74,7 @@ var (
 		NetId:          ptr.To("net-bar"),
 		SubnetId:       ptr.To("subnet-bar"),
 		SecurityGroups: []sdk.SecurityGroupLight{{SecurityGroupId: "sg-controlplane"}, {SecurityGroupId: "sg-node"}},
-		State:          "running",
+		State:          osc.VmStateRunning,
 	}
 	self = cloud.FromOscVm(&sdkSelf)
 )
@@ -83,12 +84,12 @@ func expectVMs(mock *oapimocks.MockOAPI, vms ...sdk.Vm) {
 		ReadVms(gomock.Any(), gomock.Eq(sdk.ReadVmsRequest{
 			Filters: &sdk.FiltersVm{
 				TagKeys: &[]string{"OscK8sClusterID/foo"},
-				VmStateNames: &[]string{
-					"pending",
-					"running",
-					"stopping",
-					"stopped",
-					"shutting-down",
+				VmStateNames: &[]osc.VmState{
+					osc.VmStatePending,
+					osc.VmStateRunning,
+					osc.VmStateStopping,
+					osc.VmStateStopped,
+					osc.VmStateShuttingDown,
 				},
 			},
 		})).

cloud-controller-manager/osc/cloud/vm.go ccm/cloud/vm.gocloud-controller-manager/osc/cloud/vm.go renamed to ccm/cloud/vm.go

@@ -1,11 +1,11 @@
-package osc
+package ccm
 
 import (
 	"context"
 	"errors"
 	"fmt"
 
-	"github.com/outscale/cloud-provider-osc/cloud-controller-manager/osc/cloud"
+	"github.com/outscale/cloud-provider-osc/ccm/cloud"
 	"k8s.io/client-go/informers"
 	"k8s.io/klog/v2"
 )