diff --git a/interoperator/api/resource/v1alpha1/interface.go b/interoperator/api/resource/v1alpha1/interface.go index 5196149a8..64ee780df 100644 --- a/interoperator/api/resource/v1alpha1/interface.go +++ b/interoperator/api/resource/v1alpha1/interface.go @@ -63,6 +63,7 @@ func (cluster *SFCluster) GetKubeConfig(c kubernetes.Client) (*rest.Config, erro // SFClusterInterface is defined so that and SFCluster can be mocked in tests // +kubebuilder:object:generate=false +// //go:generate mockgen -destination ./mock_sfcluster/mock_sfcluster.go github.com/cloudfoundry-incubator/service-fabrik-broker/interoperator/api/resource/v1alpha1 SFClusterInterface type SFClusterInterface interface { metav1.Object diff --git a/interoperator/controllers/multiclusterdeploy/offboarding/offboarding_controller_test.go b/interoperator/controllers/multiclusterdeploy/offboarding/offboarding_controller_test.go index 01353924a..55f02a5c3 100644 --- a/interoperator/controllers/multiclusterdeploy/offboarding/offboarding_controller_test.go +++ b/interoperator/controllers/multiclusterdeploy/offboarding/offboarding_controller_test.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/interoperator/controllers/multiclusterdeploy/sfplanoffboarding/offboarding_sfplan_controller_test.go b/interoperator/controllers/multiclusterdeploy/sfplanoffboarding/offboarding_sfplan_controller_test.go index 26960c5b9..b3b2f774e 100644 --- a/interoperator/controllers/multiclusterdeploy/sfplanoffboarding/offboarding_sfplan_controller_test.go +++ b/interoperator/controllers/multiclusterdeploy/sfplanoffboarding/offboarding_sfplan_controller_test.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/interoperator/controllers/multiclusterdeploy/watchmanager/manager.go b/interoperator/controllers/multiclusterdeploy/watchmanager/manager.go index 3582ee708..94544e66c 100644 --- a/interoperator/controllers/multiclusterdeploy/watchmanager/manager.go +++ b/interoperator/controllers/multiclusterdeploy/watchmanager/manager.go @@ -19,6 +19,7 @@ var log = logf.Log.WithName("watchmanager.mcd") var managerObject watchManagerInterface // watchManager manages multi cluster watch +// //go:generate mockgen -source manager.go -destination ./mock_manager.go -package watchmanager type watchManagerInterface interface { getWatchChannel(resource string) (<-chan event.GenericEvent, error) diff --git a/interoperator/internal/renderer/helm/renderer.go b/interoperator/internal/renderer/helm/renderer.go index 51d6a108c..ab5f567fc 100644 --- a/interoperator/internal/renderer/helm/renderer.go +++ b/interoperator/internal/renderer/helm/renderer.go @@ -18,7 +18,6 @@ package helm import ( "fmt" - "io/ioutil" "os" "path" "strings" @@ -119,7 +118,7 @@ func (r *helmRenderer) Render(rawInput renderer.Input) (renderer.Output, error) return nil, err } - dir, err := ioutil.TempDir("", "helm") + dir, err := os.MkdirTemp("", "helm") if err != nil { return nil, err } diff --git a/interoperator/internal/renderer/helm/renderer_test.go b/interoperator/internal/renderer/helm/renderer_test.go index 542bcf6b9..75b2d43b0 100644 --- a/interoperator/internal/renderer/helm/renderer_test.go +++ b/interoperator/internal/renderer/helm/renderer_test.go @@ -18,7 +18,7 @@ package helm import ( "fmt" - "io/ioutil" + "os" "reflect" "testing" @@ -213,7 +213,7 @@ func Test_helmRenderer_processCRDS(t *testing.T) { output := make(map[string]string) - sampleCRDFile, err := ioutil.ReadFile("./samples/postgresql/crds/sample.yaml") + sampleCRDFile, err := os.ReadFile("./samples/postgresql/crds/sample.yaml") if err != nil { fmt.Printf("Failed to read sampleCRD file: %v\n", err) return diff --git a/interoperator/internal/resources/resources.go b/interoperator/internal/resources/resources.go index ff7eb8a2a..74e515d5b 100644 --- a/interoperator/internal/resources/resources.go +++ b/interoperator/internal/resources/resources.go @@ -20,6 +20,7 @@ import ( var log = logf.Log.WithName("resources.internal") // ResourceManager defines the interface implemented by resources +// //go:generate mockgen -source resources.go -destination ./mock_resources/mock_resources.go type ResourceManager interface { ComputeExpectedResources(client kubernetes.Client, instanceID, bindingID, serviceID, planID, action, namespace string) ([]*unstructured.Unstructured, error) diff --git a/interoperator/pkg/client/clientset/versioned/fake/register.go b/interoperator/pkg/client/clientset/versioned/fake/register.go index b8826fc4b..5dca464dc 100644 --- a/interoperator/pkg/client/clientset/versioned/fake/register.go +++ b/interoperator/pkg/client/clientset/versioned/fake/register.go @@ -38,14 +38,14 @@ var localSchemeBuilder = runtime.SchemeBuilder{ // AddToScheme adds all types of this clientset into the given scheme. This allows composition // of clientsets, like in: // -// import ( -// "k8s.io/client-go/kubernetes" -// clientsetscheme "k8s.io/client-go/kubernetes/scheme" -// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" -// ) +// import ( +// "k8s.io/client-go/kubernetes" +// clientsetscheme "k8s.io/client-go/kubernetes/scheme" +// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" +// ) // -// kclientset, _ := kubernetes.NewForConfig(c) -// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// kclientset, _ := kubernetes.NewForConfig(c) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. diff --git a/interoperator/pkg/client/clientset/versioned/scheme/register.go b/interoperator/pkg/client/clientset/versioned/scheme/register.go index ad0f63a09..15d3a171c 100644 --- a/interoperator/pkg/client/clientset/versioned/scheme/register.go +++ b/interoperator/pkg/client/clientset/versioned/scheme/register.go @@ -38,14 +38,14 @@ var localSchemeBuilder = runtime.SchemeBuilder{ // AddToScheme adds all types of this clientset into the given scheme. This allows composition // of clientsets, like in: // -// import ( -// "k8s.io/client-go/kubernetes" -// clientsetscheme "k8s.io/client-go/kubernetes/scheme" -// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" -// ) +// import ( +// "k8s.io/client-go/kubernetes" +// clientsetscheme "k8s.io/client-go/kubernetes/scheme" +// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" +// ) // -// kclientset, _ := kubernetes.NewForConfig(c) -// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// kclientset, _ := kubernetes.NewForConfig(c) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. diff --git a/interoperator/pkg/cluster/registry/registry.go b/interoperator/pkg/cluster/registry/registry.go index 702e1385e..cfa3f4e8e 100644 --- a/interoperator/pkg/cluster/registry/registry.go +++ b/interoperator/pkg/cluster/registry/registry.go @@ -21,6 +21,7 @@ import ( var log = logf.Log.WithName("cluster.registry") // ClusterRegistry keep track of clusters and gets client for them +// //go:generate mockgen -source registry.go -destination ./mock_registry/mock_registry.go type ClusterRegistry interface { GetClient(clusterID string) (kubernetes.Client, error) diff --git a/webhooks/pkg/webhooks/manager/event.go b/webhooks/pkg/webhooks/manager/event.go index 7691cb5cb..352be6cd9 100644 --- a/webhooks/pkg/webhooks/manager/event.go +++ b/webhooks/pkg/webhooks/manager/event.go @@ -19,13 +19,13 @@ import ( "k8s.io/api/admission/v1beta1" ) -//LastOperationType +// LastOperationType const ( loUpdate string = "update" loCreate string = "create" ) -//State +// State const ( Succeeded string = "succeeded" Delete string = "delete" diff --git a/webhooks/pkg/webhooks/manager/event_test.go b/webhooks/pkg/webhooks/manager/event_test.go index 83eae31e3..04077bf61 100644 --- a/webhooks/pkg/webhooks/manager/event_test.go +++ b/webhooks/pkg/webhooks/manager/event_test.go @@ -4,7 +4,7 @@ import ( "context" "encoding/json" "errors" - "io/ioutil" + "os" "github.com/cloudfoundry-incubator/service-fabrik-broker/webhooks/pkg/apis/instance/v1alpha1" c "github.com/cloudfoundry-incubator/service-fabrik-broker/webhooks/pkg/webhooks/manager/constants" @@ -58,8 +58,8 @@ var _ = Describe("Event", func() { ar v1beta1.AdmissionReview arDockerCreate v1beta1.AdmissionReview ) - dat, err := ioutil.ReadFile("test_resources/admission_request.json") - dockerCreateAr, err := ioutil.ReadFile("test_resources/admission_request_docker_create.json") + dat, err := os.ReadFile("test_resources/admission_request.json") + dockerCreateAr, err := os.ReadFile("test_resources/admission_request_docker_create.json") if err != nil { panic(err) } diff --git a/webhooks/pkg/webhooks/manager/webhook.go b/webhooks/pkg/webhooks/manager/webhook.go index 5d8d9b9ec..83dd902ab 100644 --- a/webhooks/pkg/webhooks/manager/webhook.go +++ b/webhooks/pkg/webhooks/manager/webhook.go @@ -4,7 +4,7 @@ import ( "bytes" "encoding/json" "fmt" - "io/ioutil" + "io" "net/http" "strings" @@ -144,7 +144,7 @@ func (whsvr *WebhookServer) meter(evt EventInterface, a APIServerInterface) *v1b func (whsvr *WebhookServer) serve(w http.ResponseWriter, r *http.Request) { var body []byte if r.Body != nil { - if data, err := ioutil.ReadAll(r.Body); err == nil { + if data, err := io.ReadAll(r.Body); err == nil { body = data } } diff --git a/webhooks/pkg/webhooks/manager/webhook_test.go b/webhooks/pkg/webhooks/manager/webhook_test.go index 98d80d216..294386343 100644 --- a/webhooks/pkg/webhooks/manager/webhook_test.go +++ b/webhooks/pkg/webhooks/manager/webhook_test.go @@ -5,9 +5,9 @@ import ( "encoding/json" "errors" "fmt" - "io/ioutil" "net/http" "net/http/httptest" + "os" "reflect" "testing" @@ -221,7 +221,7 @@ func Test_createPatch(t *testing.T) { func TestWebhookServer_mutate(t *testing.T) { var ar v1beta1.AdmissionReview var arInvalid v1beta1.AdmissionReview - dat, err := ioutil.ReadFile("test_resources/admission_request.json") + dat, err := os.ReadFile("test_resources/admission_request.json") if err != nil { panic(err) } @@ -302,7 +302,7 @@ func TestWebhookServer_mutate(t *testing.T) { } func TestWebhookServer_serve(t *testing.T) { - dat, err := ioutil.ReadFile("test_resources/admission_request.json") + dat, err := os.ReadFile("test_resources/admission_request.json") if err != nil { panic(err) }