From 1f051c02afbc92c4681dda0b4da3c2c1d41d7d79 Mon Sep 17 00:00:00 2001 From: Vivek Goyal Date: Tue, 17 Dec 2024 10:01:56 -0800 Subject: [PATCH] Fix linter issues Signed-off-by: Vivek Goyal --- .golangci.yml | 1 - internal/client/proxy/tls_test.go | 5 +++++ internal/client/transport/methods_test.go | 1 + internal/helper/helper.go | 1 + internal/helper/retry.go | 1 + .../akscluster/resource_akscluster_test.go | 1 + .../resources/cluster/tkgaws/resource_tkg_aws.go | 1 + .../clusterclass/datasource_cluster_class.go | 2 +- .../ekscluster/ekscluster_flatten_test.go | 1 + internal/resources/ekscluster/helpers_test.go | 6 ++++-- .../gitrepository/data_source_git_repository.go | 2 +- .../gitrepository/resource_git_repository.go | 2 +- .../resources/helmcharts/helm_charts_mock_test.go | 14 +++++++------- .../helmfeature/data_source_helm_feature.go | 2 +- .../helmrelease/data_source_helm_release.go | 2 +- .../resources/helmrelease/resource_helm_release.go | 2 +- .../helmrepository/helm_repository_data_source.go | 2 +- .../helmrepository/helm_repository_mock_test.go | 14 +++++++------- .../resources/iampolicy/resource_iam_policy.go | 2 +- .../kustomization/resource_kustomization.go | 4 ++-- .../datasource_permission_template.go | 2 +- internal/resources/permissiontemplate/schema.go | 1 + .../kind/network/recipe/custom_common_schema.go | 1 - .../kind/network/recipe/custom_egress_schema.go | 1 - .../kind/network/recipe/custom_ingress_schema.go | 1 - internal/resources/policy/operations/update.go | 2 +- .../provisioner/data_source_provisioner.go | 9 +++++---- .../sourcesecret/resource_sourcesecret.go | 2 +- .../resources/tanzukubernetescluster/helper.go | 3 ++- .../resource_tanzu_kuberenetes_cluster.go | 2 +- .../tanzupackageinstall/spec/cluster_scope.go | 5 ++++- .../resource_package_repository.go | 2 +- 32 files changed, 56 insertions(+), 41 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 51d78c1d5..3cb3de3fb 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -26,7 +26,6 @@ linters: - asciicheck - bodyclose - copyloopvar - - depguard - dogsled - dupl - errcheck diff --git a/internal/client/proxy/tls_test.go b/internal/client/proxy/tls_test.go index 3d0aa374b..34b0f4d39 100644 --- a/internal/client/proxy/tls_test.go +++ b/internal/client/proxy/tls_test.go @@ -47,6 +47,7 @@ J+guVb41E7ckHez4ENTEj2hrqrYifViGvOaSAG3w1d8PW+wIj3jI6vQk7vTO6mbt ws3Up/6R4aI0ohB4wjOfUCL6x9L3pyQcDoumDuy8ToyL5Pk= -----END CERTIFICATE----- ` + // nolint: gosec clientKey = ` -----BEGIN RSA PRIVATE KEY----- MIIEpQIBAAKCAQEA51mGnwWS2HJTzbfGgALTgBz69OMEgPGljrfv58lOU50V+bU2 @@ -281,15 +282,19 @@ func TestGetConnectorTLSConfig(t *testing.T) { require.EqualError(t, actualErr, tc.expectedErr.Error()) return } + require.NoError(t, actualErr) + if tc.expectedTLSConfig.GetClientCertificate != nil { require.NotNil(t, actualTLSConfig.GetClientCertificate) return } + if tc.expectedTLSConfig.RootCAs != nil { require.NotNil(t, actualTLSConfig.RootCAs) return } + require.Equal(t, actualTLSConfig, tc.expectedTLSConfig) }) } diff --git a/internal/client/transport/methods_test.go b/internal/client/transport/methods_test.go index 0786ecac1..209db156b 100644 --- a/internal/client/transport/methods_test.go +++ b/internal/client/transport/methods_test.go @@ -61,5 +61,6 @@ func TestConcurrentAccessOfInvokeAction(t *testing.T) { require.Error(t, actual) }() } + waitGroup.Wait() } diff --git a/internal/helper/helper.go b/internal/helper/helper.go index 1c46f988b..eb28dfbf6 100644 --- a/internal/helper/helper.go +++ b/internal/helper/helper.go @@ -81,6 +81,7 @@ func readString(input interface{}, key string) string { return data } +// nolint:gosec func SetPrimitiveValue(input, model interface{}, key string) { switch m := model.(type) { case *float64: diff --git a/internal/helper/retry.go b/internal/helper/retry.go index 45b7615f1..a4c2a72f9 100644 --- a/internal/helper/retry.go +++ b/internal/helper/retry.go @@ -28,6 +28,7 @@ func Retry(f Retryable, interval time.Duration, attempts int) (int, error) { } time.Sleep(interval) + retries++ } diff --git a/internal/resources/akscluster/resource_akscluster_test.go b/internal/resources/akscluster/resource_akscluster_test.go index c07315b81..6097bc8cf 100644 --- a/internal/resources/akscluster/resource_akscluster_test.go +++ b/internal/resources/akscluster/resource_akscluster_test.go @@ -841,6 +841,7 @@ func Test_pollUntilReady(t *testing.T) { tt.args.interval, tt.wantError, gotErr) } } + if tt.validation != nil { tt.validation(t, tt.args) } diff --git a/internal/resources/cluster/tkgaws/resource_tkg_aws.go b/internal/resources/cluster/tkgaws/resource_tkg_aws.go index a42e3d462..de804c442 100644 --- a/internal/resources/cluster/tkgaws/resource_tkg_aws.go +++ b/internal/resources/cluster/tkgaws/resource_tkg_aws.go @@ -275,6 +275,7 @@ func expandTKGAWSClusterNetwork(data []interface{}) (cluster *tkgawsmodel.Vmware if v, ok := lookUpCluster[apiServerPortKey]; ok { apiServerPort := v.(int) + // nolint:gosec cluster.APIServerPort = int32(apiServerPort) } diff --git a/internal/resources/clusterclass/datasource_cluster_class.go b/internal/resources/clusterclass/datasource_cluster_class.go index 929407d27..9b55ab6e6 100644 --- a/internal/resources/clusterclass/datasource_cluster_class.go +++ b/internal/resources/clusterclass/datasource_cluster_class.go @@ -41,7 +41,7 @@ func dataSourceClusterClassRead(ctx context.Context, data *schema.ResourceData, switch { case err != nil: return diag.FromErr(errors.Wrap(err, "Couldn't read cluster class")) - case resp.ClusterClasses == nil || len(resp.ClusterClasses) == 0: + case len(resp.ClusterClasses) == 0: data.SetId("NO_DATA") default: clusterClass := resp.ClusterClasses[0] diff --git a/internal/resources/ekscluster/ekscluster_flatten_test.go b/internal/resources/ekscluster/ekscluster_flatten_test.go index 479068659..28209fd25 100644 --- a/internal/resources/ekscluster/ekscluster_flatten_test.go +++ b/internal/resources/ekscluster/ekscluster_flatten_test.go @@ -444,6 +444,7 @@ func TestFlattenClusterSpec(t *testing.T) { t.Run(test.description, func(t *testing.T) { spec, nps := test.getInput() output := flattenClusterSpec(spec, nps) + print(test.expected) print(output) require.Equal(t, test.expected, output) diff --git a/internal/resources/ekscluster/helpers_test.go b/internal/resources/ekscluster/helpers_test.go index 88c4e7d9a..adefb80a2 100644 --- a/internal/resources/ekscluster/helpers_test.go +++ b/internal/resources/ekscluster/helpers_test.go @@ -321,8 +321,9 @@ func TestNodepoolSpecEqual(t *testing.T) { for _, test := range tests { t.Run(test.name, func(t *testing.T) { spec1 := getNodepoolSpec() - spec2 := getNodepoolSpec() test.modifySpec1(spec1) + + spec2 := getNodepoolSpec() test.modifySpec2(spec2) require.Equal(t, test.result, nodepoolSpecEqual(spec1, spec2), "return didn't match the expected output") @@ -693,8 +694,9 @@ func TestClusterSpecEqual(t *testing.T) { for _, test := range tests { t.Run(test.name, func(t *testing.T) { spec1, _ := getClusterSpec() - spec2, _ := getClusterSpec() test.modifySpec1(spec1) + + spec2, _ := getClusterSpec() test.modifySpec2(spec2) require.Equal(t, test.result, clusterSpecEqual(spec1, spec2), "return didn't match the expected output") diff --git a/internal/resources/gitrepository/data_source_git_repository.go b/internal/resources/gitrepository/data_source_git_repository.go index 842b0cc10..df060ebf5 100644 --- a/internal/resources/gitrepository/data_source_git_repository.go +++ b/internal/resources/gitrepository/data_source_git_repository.go @@ -65,7 +65,7 @@ func dataSourceGitRepositoryRead(ctx context.Context, d *schema.ResourceData, m if err != nil { if clienterrors.IsNotFoundError(err) && !helper.IsDataRead(ctx) { _ = schema.RemoveFromState(d, m) - return + return diags } return diag.FromErr(err) diff --git a/internal/resources/gitrepository/resource_git_repository.go b/internal/resources/gitrepository/resource_git_repository.go index 79b8391f7..038100948 100644 --- a/internal/resources/gitrepository/resource_git_repository.go +++ b/internal/resources/gitrepository/resource_git_repository.go @@ -226,7 +226,7 @@ func resourceGitRepositoryInPlaceUpdate(ctx context.Context, d *schema.ResourceD if !updateAvailable { log.Printf("[INFO] git repository update is not required") - return + return diags } switch scopedFullnameData.Scope { diff --git a/internal/resources/helmcharts/helm_charts_mock_test.go b/internal/resources/helmcharts/helm_charts_mock_test.go index 657a060c9..78574712d 100644 --- a/internal/resources/helmcharts/helm_charts_mock_test.go +++ b/internal/resources/helmcharts/helm_charts_mock_test.go @@ -20,13 +20,6 @@ import ( objectmetamodel "github.com/vmware/terraform-provider-tanzu-mission-control/internal/models/objectmeta" ) -const ( - https = "https:/" - clAPIVersionAndGroup = "v1alpha1/organization/fluxcd/helm/repositories" - apiSubGroup = "chartmetadatas" - apiKind = "charts" -) - // nolint: unused func bodyInspectingResponder(t *testing.T, expectedContent interface{}, successResponse int, successResponseBody interface{}) httpmock.Responder { return func(r *http.Request) (*http.Response, error) { @@ -120,6 +113,13 @@ func (testConfig *testAcceptanceConfig) setupHTTPMocks(t *testing.T) { }, } + const ( + https = "https:/" + clAPIVersionAndGroup = "v1alpha1/organization/fluxcd/helm/repositories" + apiSubGroup = "chartmetadatas" + apiKind = "charts" + ) + getPkgEndpoint := (helper.ConstructRequestURL(https, endpoint, clAPIVersionAndGroup, "*", apiSubGroup, testConfig.ChartMetadataName, apiKind)).String() httpmock.RegisterResponder("GET", getPkgEndpoint, diff --git a/internal/resources/helmfeature/data_source_helm_feature.go b/internal/resources/helmfeature/data_source_helm_feature.go index ef64bc76f..15fdcf647 100644 --- a/internal/resources/helmfeature/data_source_helm_feature.go +++ b/internal/resources/helmfeature/data_source_helm_feature.go @@ -53,7 +53,7 @@ func dataSourceHelmRead(ctx context.Context, d *schema.ResourceData, m interface if err != nil { if clienterrors.IsNotFoundError(err) && !helper.IsDataRead(ctx) { _ = schema.RemoveFromState(d, m) - return + return diags } return diag.FromErr(err) diff --git a/internal/resources/helmrelease/data_source_helm_release.go b/internal/resources/helmrelease/data_source_helm_release.go index c9ed4faa5..dddd95aa2 100644 --- a/internal/resources/helmrelease/data_source_helm_release.go +++ b/internal/resources/helmrelease/data_source_helm_release.go @@ -65,7 +65,7 @@ func dataSourceHelmReleaseRead(ctx context.Context, d *schema.ResourceData, m in if err != nil { if clienterrors.IsNotFoundError(err) && !helper.IsDataRead(ctx) { _ = schema.RemoveFromState(d, m) - return + return diags } return diag.FromErr(err) diff --git a/internal/resources/helmrelease/resource_helm_release.go b/internal/resources/helmrelease/resource_helm_release.go index e50e34953..b35cb940c 100644 --- a/internal/resources/helmrelease/resource_helm_release.go +++ b/internal/resources/helmrelease/resource_helm_release.go @@ -267,7 +267,7 @@ func resourceHelmReleaseInPlaceUpdate(ctx context.Context, d *schema.ResourceDat if !updateAvailable { log.Printf("[INFO] helm release update is not required") - return + return diags } switch scopedFullnameData.Scope { diff --git a/internal/resources/helmrepository/helm_repository_data_source.go b/internal/resources/helmrepository/helm_repository_data_source.go index 374c9dba4..da38e6ad0 100644 --- a/internal/resources/helmrepository/helm_repository_data_source.go +++ b/internal/resources/helmrepository/helm_repository_data_source.go @@ -84,7 +84,7 @@ func dataSourceHelmRepositoryRead(ctx context.Context, d *schema.ResourceData, m if err != nil { if clienterrors.IsNotFoundError(err) && !helper.IsDataRead(ctx) { _ = schema.RemoveFromState(d, m) - return + return diags } return diag.FromErr(err) diff --git a/internal/resources/helmrepository/helm_repository_mock_test.go b/internal/resources/helmrepository/helm_repository_mock_test.go index f64bcd855..a739224c9 100644 --- a/internal/resources/helmrepository/helm_repository_mock_test.go +++ b/internal/resources/helmrepository/helm_repository_mock_test.go @@ -20,13 +20,6 @@ import ( objectmetamodel "github.com/vmware/terraform-provider-tanzu-mission-control/internal/models/objectmeta" ) -const ( - https = "https:/" - clAPIVersionAndGroup = "v1alpha1/clusters" - apiSubGroup = "namespaces" - apiKind = "fluxcd/helm/repositories" -) - // nolint: unused func bodyInspectingResponder(t *testing.T, expectedContent interface{}, successResponse int, successResponseBody interface{}) httpmock.Responder { return func(r *http.Request) (*http.Response, error) { @@ -124,6 +117,13 @@ func (testConfig *testAcceptanceConfig) setupHTTPMocks(t *testing.T) { }, } + const ( + https = "https:/" + clAPIVersionAndGroup = "v1alpha1/clusters" + apiSubGroup = "namespaces" + apiKind = "fluxcd/helm/repositories" + ) + getPkgEndpoint := (helper.ConstructRequestURL(https, endpoint, clAPIVersionAndGroup, testConfig.ScopeHelperResources.Cluster.Name, apiSubGroup, testConfig.Namespace, apiKind)).String() httpmock.RegisterResponder("GET", getPkgEndpoint, diff --git a/internal/resources/iampolicy/resource_iam_policy.go b/internal/resources/iampolicy/resource_iam_policy.go index 90e0c1d67..e392188c6 100644 --- a/internal/resources/iampolicy/resource_iam_policy.go +++ b/internal/resources/iampolicy/resource_iam_policy.go @@ -223,7 +223,7 @@ func resourceIAMPolicyRead(_ context.Context, d *schema.ResourceData, m interfac // when iam policy resource is empty: no role bindings are existing, this is equivalent to not found condition. if len(policyList) == 0 { _ = schema.RemoveFromState(d, m) - return + return diags } d.SetId(d.State().ID) diff --git a/internal/resources/kustomization/resource_kustomization.go b/internal/resources/kustomization/resource_kustomization.go index c025c1f5e..30a62058b 100644 --- a/internal/resources/kustomization/resource_kustomization.go +++ b/internal/resources/kustomization/resource_kustomization.go @@ -86,7 +86,7 @@ func resourceKustomizationRead(ctx context.Context, d *schema.ResourceData, m in if err != nil { if clienterrors.IsNotFoundError(err) { _ = schema.RemoveFromState(d, m) - return + return diags } return diag.FromErr(err) @@ -346,7 +346,7 @@ func resourceKustomizationInPlaceUpdate(ctx context.Context, d *schema.ResourceD if !updateAvailable { log.Printf("[INFO] kustomization update is not required") - return + return diags } switch scopedFullnameData.Scope { diff --git a/internal/resources/permissiontemplate/datasource_permission_template.go b/internal/resources/permissiontemplate/datasource_permission_template.go index 6ae786004..02eb3d241 100644 --- a/internal/resources/permissiontemplate/datasource_permission_template.go +++ b/internal/resources/permissiontemplate/datasource_permission_template.go @@ -69,7 +69,7 @@ func dataSourcePermissionTemplateRead(ctx context.Context, data *schema.Resource } } - if response.TemplateValues != nil && len(response.TemplateValues) > 0 { + if len(response.TemplateValues) > 0 { // This is necessary because sometimes the template parameters definition and the template values returned from the API do not match. err = removeUndefinedTemplateValues(response) diff --git a/internal/resources/permissiontemplate/schema.go b/internal/resources/permissiontemplate/schema.go index 206b9515b..b6206d3d4 100644 --- a/internal/resources/permissiontemplate/schema.go +++ b/internal/resources/permissiontemplate/schema.go @@ -113,6 +113,7 @@ func buildCapabilityProviderDescription(schemaKey string) (description string) { for k, v := range capabilityProviderMap { valueDescription := fmt.Sprintf("When %s is set to '%s' %s must be set to '%s'.", ProviderKey, v, CapabilityKey, k) description = fmt.Sprintf("%s\n%s", description, valueDescription) + validValues = append(validValues, v) } diff --git a/internal/resources/policy/kind/network/recipe/custom_common_schema.go b/internal/resources/policy/kind/network/recipe/custom_common_schema.go index 001db7b00..2d03ce1b7 100644 --- a/internal/resources/policy/kind/network/recipe/custom_common_schema.go +++ b/internal/resources/policy/kind/network/recipe/custom_common_schema.go @@ -295,7 +295,6 @@ func flattenCustomRule(rule *policyrecipenetworkcommonmodel.V1alpha1CommonPolicy var ports []interface{} for _, port := range *rule.Ports { - port := port ports = append(ports, flattenPort(&port)) } diff --git a/internal/resources/policy/kind/network/recipe/custom_egress_schema.go b/internal/resources/policy/kind/network/recipe/custom_egress_schema.go index 3a7fae791..122303f0e 100644 --- a/internal/resources/policy/kind/network/recipe/custom_egress_schema.go +++ b/internal/resources/policy/kind/network/recipe/custom_egress_schema.go @@ -129,7 +129,6 @@ func FlattenCustomEgress(customEgress *policyrecipenetworkmodel.V1alpha1CommonPo var rules []interface{} for _, rule := range customEgress.Rules { - rule := rule rules = append(rules, flattenCustomRule(&rule)) } diff --git a/internal/resources/policy/kind/network/recipe/custom_ingress_schema.go b/internal/resources/policy/kind/network/recipe/custom_ingress_schema.go index 9b8a38963..f0e462502 100644 --- a/internal/resources/policy/kind/network/recipe/custom_ingress_schema.go +++ b/internal/resources/policy/kind/network/recipe/custom_ingress_schema.go @@ -129,7 +129,6 @@ func FlattenCustomIngress(customIngress *policyrecipenetworkmodel.V1alpha1Common var rules []interface{} for _, rule := range customIngress.Rules { - rule := rule rules = append(rules, flattenCustomRule(&rule)) } diff --git a/internal/resources/policy/operations/update.go b/internal/resources/policy/operations/update.go index 489203048..62a71142d 100644 --- a/internal/resources/policy/operations/update.go +++ b/internal/resources/policy/operations/update.go @@ -64,7 +64,7 @@ func ResourcePolicyInPlaceUpdate(ctx context.Context, d *schema.ResourceData, m if !updateAvailable { log.Printf("[INFO] %s policy update is not required", rn) - return + return diags } switch scopedFullnameData.Scope { diff --git a/internal/resources/provisioner/data_source_provisioner.go b/internal/resources/provisioner/data_source_provisioner.go index f693b1d8b..34f8fb07d 100644 --- a/internal/resources/provisioner/data_source_provisioner.go +++ b/internal/resources/provisioner/data_source_provisioner.go @@ -75,19 +75,20 @@ func dataSourceProvisionerRead(ctx context.Context, d *schema.ResourceData, m in if err != nil { if clienterrors.IsNotFoundError(err) && !helper.IsDataRead(ctx) { _ = schema.RemoveFromState(d, m) - return + return diags } - return + return diags } } else { getResp, err := config.TMCConnection.ProvisionerResourceService.ProvisionerResourceServiceGet(model.Provisioners[0].FullName) if err != nil { if clienterrors.IsNotFoundError(err) && !helper.IsDataRead(ctx) { _ = schema.RemoveFromState(d, m) - return + return diags } - return + + return diags } p := &provisioner.VmwareTanzuManageV1alpha1ManagementclusterProvisionerListprovisionersResponse{ diff --git a/internal/resources/sourcesecret/resource_sourcesecret.go b/internal/resources/sourcesecret/resource_sourcesecret.go index 7146550bb..71206e363 100644 --- a/internal/resources/sourcesecret/resource_sourcesecret.go +++ b/internal/resources/sourcesecret/resource_sourcesecret.go @@ -262,7 +262,7 @@ func resourceSourcesecretInPlaceUpdate(ctx context.Context, d *schema.ResourceDa } if !updateAvailable { - return + return diags } switch scopedFullnameData.Scope { diff --git a/internal/resources/tanzukubernetescluster/helper.go b/internal/resources/tanzukubernetescluster/helper.go index fad4ae314..8a047c7ac 100644 --- a/internal/resources/tanzukubernetescluster/helper.go +++ b/internal/resources/tanzukubernetescluster/helper.go @@ -205,7 +205,7 @@ func waitNodePoolsReady(ctx context.Context, config *authctx.TanzuContext, clust errMsg = fmt.Sprintf("%s\n%s", errMsg, npStatusMsg) } - err = errors.Wrapf(err, errMsg) + err = errors.Wrapf(err, "%s", errMsg) } return err @@ -461,6 +461,7 @@ func removeModelVariable(clusterClassSchema interface{}, modelVariable interface } else { modelVarAdditionalProperties, additionalPropertiesExist := clusterClassSchema.(map[string]interface{})[string(openapiv3.AdditionalPropertiesKey)] preserve, preserveExists := clusterClassSchema.(map[string]interface{})[string(openapiv3.PreserveUnknownFieldKey)] + if additionalPropertiesExist { _, propertiesExist := modelVarAdditionalProperties.(map[string]interface{})[string(openapiv3.PropertiesKey)] diff --git a/internal/resources/tanzukubernetescluster/resource_tanzu_kuberenetes_cluster.go b/internal/resources/tanzukubernetescluster/resource_tanzu_kuberenetes_cluster.go index 54919170f..f4aa4dc19 100644 --- a/internal/resources/tanzukubernetescluster/resource_tanzu_kuberenetes_cluster.go +++ b/internal/resources/tanzukubernetescluster/resource_tanzu_kuberenetes_cluster.go @@ -392,7 +392,7 @@ func validateSchema(_ context.Context, data *schema.ResourceDiff, value interfac if err != nil { return errors.Wrapf(err, "Couldn't find cluster class.\nManagement Cluster Name: %s, Provisioner: %s, Cluster Class Name: %s.", clusterClassFn.ManagementClusterName, clusterClassFn.ProvisionerName, clusterClassFn.Name) - } else if resp.ClusterClasses == nil || len(resp.ClusterClasses) == 0 { + } else if len(resp.ClusterClasses) == 0 { return errors.Errorf("Couldn't find cluster class.\nManagement Cluster Name: %s, Provisioner: %s, Cluster Class Name: %s.", clusterClassFn.ManagementClusterName, clusterClassFn.ProvisionerName, clusterClassFn.Name) } diff --git a/internal/resources/tanzupackageinstall/spec/cluster_scope.go b/internal/resources/tanzupackageinstall/spec/cluster_scope.go index 16ac6611b..a5b7ee450 100644 --- a/internal/resources/tanzupackageinstall/spec/cluster_scope.go +++ b/internal/resources/tanzupackageinstall/spec/cluster_scope.go @@ -18,7 +18,10 @@ import ( "github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/common" ) -func ConstructSpecForClusterScope(d *schema.ResourceData) (spec *packageinstallmodel.VmwareTanzuManageV1alpha1ClusterNamespaceTanzupackageInstallSpec, err error) { +// nolint: gocognit +func ConstructSpecForClusterScope(d *schema.ResourceData) ( + spec *packageinstallmodel.VmwareTanzuManageV1alpha1ClusterNamespaceTanzupackageInstallSpec, + err error) { value, ok := d.GetOk(SpecKey) if !ok { return spec, nil diff --git a/internal/resources/tanzupackagerepository/resource_package_repository.go b/internal/resources/tanzupackagerepository/resource_package_repository.go index 828825fce..89878dfc1 100644 --- a/internal/resources/tanzupackagerepository/resource_package_repository.go +++ b/internal/resources/tanzupackagerepository/resource_package_repository.go @@ -239,7 +239,7 @@ func resourcePackageRepositoryInPlaceUpdate(ctx context.Context, d *schema.Resou } if !updateCheckForMeta(d, pkgRepoDataFromServer.meta) && !updateCheckForSpec(d, pkgRepoDataFromServer.spec) && !d.HasChange(disabledKey) { - return + return diags } return dataPackageRepositoryRead(ctx, d, m)