Rename [Encode|Decode]ProviderConfig to [Encode|Decode]ProviderSpec

openshift · Jan 10, 2019 · 79fc4a4 · 79fc4a4
1 parent a1ad91d
commit 79fc4a4
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 28 deletions.
diff --git a/pkg/actuators/machine/actuator_test.go b/pkg/actuators/machine/actuator_test.go
@@ -599,7 +599,7 @@ func TestAvailabiltyZone(t *testing.T) {
 			}
 
 			machinePc := &providerconfigv1.AWSMachineProviderConfig{}
-			if err = codec.DecodeProviderConfig(&machine.Spec.ProviderSpec, machinePc); err != nil {
+			if err = codec.DecodeProviderSpec(&machine.Spec.ProviderSpec, machinePc); err != nil {
 				t.Fatal(err)
 			}
 
@@ -613,7 +613,7 @@ func TestAvailabiltyZone(t *testing.T) {
 				machinePc.Subnet.ID = aws.String(tc.subnet)
 			}
 
-			config, err := codec.EncodeProviderConfig(machinePc)
+			config, err := codec.EncodeProviderSpec(machinePc)
 			if err != nil {
 				t.Fatal(err)
 			}

diff --git a/pkg/actuators/machine/stubs.go b/pkg/actuators/machine/stubs.go
@@ -103,9 +103,9 @@ func stubMachine() (*clusterv1.Machine, error) {
 	if err != nil {
 		return nil, fmt.Errorf("failed creating codec: %v", err)
 	}
-	config, err := codec.EncodeProviderConfig(machinePc)
+	providerSpec, err := codec.EncodeProviderSpec(machinePc)
 	if err != nil {
-		return nil, fmt.Errorf("codec.EncodeProviderConfig failed: %v", err)
+		return nil, fmt.Errorf("codec.EncodeProviderSpec failed: %v", err)
 	}
 
 	machine := &clusterv1.Machine{
@@ -120,7 +120,7 @@ func stubMachine() (*clusterv1.Machine, error) {
 		},
 
 		Spec: clusterv1.MachineSpec{
-			ProviderSpec: *config,
+			ProviderSpec: *providerSpec,
 		},
 	}
 

diff --git a/pkg/actuators/machine/utils.go b/pkg/actuators/machine/utils.go
@@ -165,7 +165,7 @@ func providerConfigFromMachine(client client.Client, machine *clusterv1.Machine,
 	}
 
 	var config providerconfigv1.AWSMachineProviderConfig
-	if err := codec.DecodeProviderConfig(&clusterv1.ProviderSpec{Value: &providerSpecRawExtention}, &config); err != nil {
+	if err := codec.DecodeProviderSpec(&clusterv1.ProviderSpec{Value: &providerSpecRawExtention}, &config); err != nil {
 		return nil, err
 	}
 	return &config, nil

diff --git a/pkg/actuators/machine/utils_test.go b/pkg/actuators/machine/utils_test.go
@@ -50,7 +50,7 @@ func TestProviderConfigFromMachine(t *testing.T) {
 	if err != nil {
 		t.Error(err)
 	}
-	encodedProviderConfig, err := codec.EncodeProviderConfig(providerConfig)
+	encodedProviderSpec, err := codec.EncodeProviderSpec(providerConfig)
 	if err != nil {
 		t.Error(err)
 	}
@@ -60,7 +60,7 @@ func TestProviderConfigFromMachine(t *testing.T) {
 			Namespace: "openshift-cluster-api",
 			Name:      "testClass",
 		},
-		ProviderSpec: *encodedProviderConfig.Value,
+		ProviderSpec: *encodedProviderSpec.Value,
 	}
 
 	testCases := []struct {
@@ -79,7 +79,7 @@ func TestProviderConfigFromMachine(t *testing.T) {
 					Kind: "Machine",
 				},
 				Spec: clusterv1.MachineSpec{
-					ProviderSpec: *encodedProviderConfig,
+					ProviderSpec: *encodedProviderSpec,
 				},
 			},
 		},

diff --git a/pkg/apis/awsproviderconfig/v1alpha1/register.go b/pkg/apis/awsproviderconfig/v1alpha1/register.go
@@ -73,8 +73,8 @@ func NewCodec() (*AWSProviderConfigCodec, error) {
 	return &codec, nil
 }
 
-// DecodeProviderConfig deserialises an object from the provider config
-func (codec *AWSProviderConfigCodec) DecodeProviderConfig(providerSpec *clusterv1.ProviderSpec, out runtime.Object) error {
+// DecodeProviderSpec deserialises an object from the provider config
+func (codec *AWSProviderConfigCodec) DecodeProviderSpec(providerSpec *clusterv1.ProviderSpec, out runtime.Object) error {
 	if providerSpec.Value != nil {
 		_, _, err := codec.decoder.Decode(providerSpec.Value.Raw, nil, out)
 		if err != nil {
@@ -84,8 +84,8 @@ func (codec *AWSProviderConfigCodec) DecodeProviderConfig(providerSpec *clusterv
 	return nil
 }
 
-// EncodeProviderConfig serialises an object to the provider config
-func (codec *AWSProviderConfigCodec) EncodeProviderConfig(in runtime.Object) (*clusterv1.ProviderSpec, error) {
+// EncodeProviderSpec serialises an object to the provider config
+func (codec *AWSProviderConfigCodec) EncodeProviderSpec(in runtime.Object) (*clusterv1.ProviderSpec, error) {
 	var buf bytes.Buffer
 	if err := codec.encoder.Encode(in, &buf); err != nil {
 		return nil, fmt.Errorf("encoding failed: %v", err)

diff --git a/pkg/apis/awsproviderconfig/v1alpha1/register_test.go b/pkg/apis/awsproviderconfig/v1alpha1/register_test.go
@@ -66,7 +66,7 @@ func TestEncodeAndDecodeProviderStatus(t *testing.T) {
 	}
 }
 
-func TestEncodeAndDecodeProviderConfig(t *testing.T) {
+func TestEncodeAndDecodeProviderSpec(t *testing.T) {
 	codec, err := NewCodec()
 	if err != nil {
 		t.Fatal(err)
@@ -155,28 +155,28 @@ func TestEncodeAndDecodeProviderConfig(t *testing.T) {
 		},
 	}
 
-	providerConfigEncoded, err := codec.EncodeProviderConfig(providerConfig)
+	providerConfigEncoded, err := codec.EncodeProviderSpec(providerConfig)
 	if err != nil {
 		t.Fatal(err)
 	}
 
 	// Without deep copy
 	{
 		providerConfigDecoded := &AWSMachineProviderConfig{}
-		codec.DecodeProviderConfig(providerConfigEncoded, providerConfigDecoded)
+		codec.DecodeProviderSpec(providerConfigEncoded, providerConfigDecoded)
 
 		if !reflect.DeepEqual(providerConfig, providerConfigDecoded) {
-			t.Errorf("failed EncodeProviderConfig/DecodeProviderConfig. Expected: %+v, got: %+v", providerConfig, providerConfigDecoded)
+			t.Errorf("failed EncodeProviderSpec/DecodeProviderSpec. Expected: %+v, got: %+v", providerConfig, providerConfigDecoded)
 		}
 	}
 
 	// With deep copy
 	{
 		providerConfigDecoded := &AWSMachineProviderConfig{}
-		codec.DecodeProviderConfig(providerConfigEncoded, providerConfigDecoded)
+		codec.DecodeProviderSpec(providerConfigEncoded, providerConfigDecoded)
 
 		if !reflect.DeepEqual(providerConfig.DeepCopy(), providerConfigDecoded) {
-			t.Errorf("failed EncodeProviderConfig/DecodeProviderConfig. Expected: %+v, got: %+v", providerConfig, providerConfigDecoded)
+			t.Errorf("failed EncodeProviderSpec/DecodeProviderSpec. Expected: %+v, got: %+v", providerConfig, providerConfigDecoded)
 		}
 	}
 }
diff --git a/test/utils/manifests.go b/test/utils/manifests.go
@@ -91,11 +91,11 @@ func TestingMachineProviderSpec(awsCredentialsSecretName string, clusterID strin
 	if err != nil {
 		return clusterv1alpha1.ProviderSpec{}, fmt.Errorf("failed creating codec: %v", err)
 	}
-	config, err := codec.EncodeProviderConfig(machinePc)
+	providerSpec, err := codec.EncodeProviderSpec(machinePc)
 	if err != nil {
-		return clusterv1alpha1.ProviderSpec{}, fmt.Errorf("EncodeToProviderConfig failed: %v", err)
+		return clusterv1alpha1.ProviderSpec{}, fmt.Errorf("codec.EncodeProviderSpec failed: %v", err)
 	}
-	return *config, nil
+	return *providerSpec, nil
 }
 
 func MasterMachineProviderSpec(awsCredentialsSecretName, masterUserDataSecretName, clusterID string) (clusterv1alpha1.ProviderSpec, error) {
@@ -153,11 +153,11 @@ func MasterMachineProviderSpec(awsCredentialsSecretName, masterUserDataSecretNam
 	if err != nil {
 		return clusterv1alpha1.ProviderSpec{}, fmt.Errorf("failed creating codec: %v", err)
 	}
-	config, err := codec.EncodeProviderConfig(machinePc)
+	providerSpec, err := codec.EncodeProviderSpec(machinePc)
 	if err != nil {
-		return clusterv1alpha1.ProviderSpec{}, fmt.Errorf("EncodeToProviderConfig failed: %v", err)
+		return clusterv1alpha1.ProviderSpec{}, fmt.Errorf("codec.EncodeProviderSpec failed: %v", err)
 	}
-	return *config, nil
+	return *providerSpec, nil
 }
 
 func WorkerMachineSetProviderSpec(awsCredentialsSecretName, workerUserDataSecretName, clusterID string) (clusterv1alpha1.ProviderSpec, error) {
@@ -215,9 +215,9 @@ func WorkerMachineSetProviderSpec(awsCredentialsSecretName, workerUserDataSecret
 	if err != nil {
 		return clusterv1alpha1.ProviderSpec{}, fmt.Errorf("failed creating codec: %v", err)
 	}
-	config, err := codec.EncodeProviderConfig(machinePc)
+	providerSpec, err := codec.EncodeProviderSpec(machinePc)
 	if err != nil {
-		return clusterv1alpha1.ProviderSpec{}, fmt.Errorf("EncodeToProviderConfig failed: %v", err)
+		return clusterv1alpha1.ProviderSpec{}, fmt.Errorf("codec.EncodeProviderSpec failed: %v", err)
 	}
-	return *config, nil
+	return *providerSpec, nil
 }