Rename variables and functions to go standard

Co-authored-by: izturn <44051386+izturn@users.noreply.github.com>
argoproj-labs · Sep 6, 2023 · 632f289 · 632f289
1 parent 3a6f412
commit 632f289
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 21 deletions.
diff --git a/pkg/mocks/plugin.go b/pkg/mocks/plugin.go
@@ -13,7 +13,7 @@ const (
 
 	HTTPProxyName               = "argo-rollouts"
 	ValidHTTPProxyName          = "argo-rollouts-valid"
-	OutdatedHTTPProxy           = "argo-rollouts-outdated"
+	OutdatedHTTPProxyName       = "argo-rollouts-outdated"
 	InvalidHTTPProxyName        = "argo-rollouts-invalid"
 	FalseConditionHTTPProxyName = "argo-rollouts-false-condition"
 
@@ -22,11 +22,11 @@ const (
 )
 
 func MakeObjects() []runtime.Object {
-	httpProxy := newValidHttpProxy(HTTPProxyName)
+	httpProxy := newHTTPProxy(HTTPProxyName)
 
-	validHttpProxy := newValidHttpProxy(ValidHTTPProxyName)
+	validHttpProxy := newHTTPProxy(ValidHTTPProxyName)
 
-	invalidHttpProxy := newValidHttpProxy(InvalidHTTPProxyName)
+	invalidHttpProxy := newHTTPProxy(InvalidHTTPProxyName)
 	invalidHttpProxy.Status = contourv1.HTTPProxyStatus{
 		Conditions: []contourv1.DetailedCondition{
 			{
@@ -39,10 +39,10 @@ func MakeObjects() []runtime.Object {
 		},
 	}
 
-	outdatedHttpProxy := newValidHttpProxy(OutdatedHTTPProxy)
+	outdatedHttpProxy := newHTTPProxy(OutdatedHTTPProxyName)
 	outdatedHttpProxy.Generation = HTTPProxyGeneration + 1
 
-	falseConditionHttpProxy := newValidHttpProxy(FalseConditionHTTPProxyName)
+	falseConditionHttpProxy := newHTTPProxy(FalseConditionHTTPProxyName)
 	falseConditionHttpProxy.Status = contourv1.HTTPProxyStatus{
 		Conditions: []contourv1.DetailedCondition{
 			{
@@ -65,7 +65,7 @@ func MakeObjects() []runtime.Object {
 	return objs
 }
 
-func newValidHttpProxy(name string) *contourv1.HTTPProxy {
+func newHTTPProxy(name string) *contourv1.HTTPProxy {
 	return &contourv1.HTTPProxy{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:       name,

diff --git a/pkg/plugin/plugin.go b/pkg/plugin/plugin.go
@@ -69,15 +69,15 @@ func (r *RpcPlugin) SetWeight(rollout *v1alpha1.Rollout, desiredWeight int32, ad
 
 	ctx := context.Background()
 
-	for _, httpProxyName := range ctr.HTTPProxies {
-		slog.Debug("updating httpproxy", slog.String("name", httpProxyName))
+	for _, proxy := range ctr.HTTPProxies {
+		slog.Debug("updating httpproxy", slog.String("name", proxy))
 
-		if err := r.updateHTTPProxy(ctx, httpProxyName, rollout, desiredWeight); err != nil {
-			slog.Error("failed to update httpproxy", slog.String("name", httpProxyName), slog.Any("err", err))
+		if err := r.updateHTTPProxy(ctx, proxy, rollout, desiredWeight); err != nil {
+			slog.Error("failed to update httpproxy", slog.String("name", proxy), slog.Any("err", err))
 			return pluginTypes.RpcError{ErrorString: err.Error()}
 		}
 
-		slog.Info("successfully updated httpproxy", slog.String("name", httpProxyName))
+		slog.Info("successfully updated httpproxy", slog.String("name", proxy))
 	}
 
 	return pluginTypes.RpcError{}
@@ -103,19 +103,19 @@ func (r *RpcPlugin) VerifyWeight(rollout *v1alpha1.Rollout, desiredWeight int32,
 
 	ctx := context.Background()
 
-	for _, httpProxyName := range ctr.HTTPProxies {
-		slog.Debug("verifying httpproxy", slog.String("name", httpProxyName))
+	for _, proxy := range ctr.HTTPProxies {
+		slog.Debug("verifying httpproxy", slog.String("name", proxy))
 
-		verified, err := r.verifyHTTPProxy(ctx, httpProxyName, rollout, desiredWeight)
+		verified, err := r.verifyHTTPProxy(ctx, proxy, rollout, desiredWeight)
 		if err != nil {
-			slog.Error("failed to verify httpproxy", slog.String("name", httpProxyName), slog.Any("err", err))
+			slog.Error("failed to verify httpproxy", slog.String("name", proxy), slog.Any("err", err))
 			return pluginTypes.NotVerified, pluginTypes.RpcError{ErrorString: err.Error()}
 		}
 		if !verified {
 			return pluginTypes.NotVerified, pluginTypes.RpcError{}
 		}
 
-		slog.Info("successfully verified httpproxy", slog.String("name", httpProxyName))
+		slog.Info("successfully verified httpproxy", slog.String("name", proxy))
 	}
 
 	return pluginTypes.Verified, pluginTypes.RpcError{}
@@ -129,7 +129,7 @@ func (r *RpcPlugin) Type() string {
 	return Type
 }
 
-func (r *RpcPlugin) getHttpProxy(ctx context.Context, namespace string, name string) (*contourv1.HTTPProxy, error) {
+func (r *RpcPlugin) getHTTPProxy(ctx context.Context, namespace string, name string) (*contourv1.HTTPProxy, error) {
 	unstr, err := r.dynamicClient.Resource(contourv1.HTTPProxyGVR).Namespace(namespace).Get(ctx, name, metav1.GetOptions{})
 	if err != nil {
 		return nil, err
@@ -143,7 +143,7 @@ func (r *RpcPlugin) getHttpProxy(ctx context.Context, namespace string, name str
 }
 
 func (r *RpcPlugin) updateHTTPProxy(ctx context.Context, httpProxyName string, rollout *v1alpha1.Rollout, desiredWeight int32) error {
-	httpProxy, err := r.getHttpProxy(ctx, rollout.Namespace, httpProxyName)
+	httpProxy, err := r.getHTTPProxy(ctx, rollout.Namespace, httpProxyName)
 	if err != nil {
 		return err
 	}
@@ -181,7 +181,7 @@ func (r *RpcPlugin) updateHTTPProxy(ctx context.Context, httpProxyName string, r
 }
 
 func (r *RpcPlugin) verifyHTTPProxy(ctx context.Context, httpProxyName string, rollout *v1alpha1.Rollout, desiredWeight int32) (bool, error) {
-	httpProxy, err := r.getHttpProxy(ctx, rollout.Namespace, httpProxyName)
+	httpProxy, err := r.getHTTPProxy(ctx, rollout.Namespace, httpProxyName)
 	if err != nil {
 		return false, err
 	}

diff --git a/pkg/plugin/plugin_test.go b/pkg/plugin/plugin_test.go
@@ -141,7 +141,7 @@ func TestRunSuccessfully(t *testing.T) {
 		verifyWeight(mocks.ValidHTTPProxyName, mocks.HTTPProxyDesiredWeight, types.Verified)
 		verifyWeight(mocks.ValidHTTPProxyName, mocks.HTTPProxyDesiredWeight+10, types.NotVerified)
 		verifyWeight(mocks.InvalidHTTPProxyName, mocks.HTTPProxyDesiredWeight, types.NotVerified)
-		verifyWeight(mocks.OutdatedHTTPProxy, mocks.HTTPProxyDesiredWeight, types.NotVerified)
+		verifyWeight(mocks.OutdatedHTTPProxyName, mocks.HTTPProxyDesiredWeight, types.NotVerified)
 		verifyWeight(mocks.FalseConditionHTTPProxyName, mocks.HTTPProxyDesiredWeight, types.NotVerified)
 	})