update tools and remove deprecated io lib

Author: ilia-medvedev-codefresh

GNUmakefile

@@ -6,15 +6,9 @@ PKG_NAME=codefresh
 NAMESPACE=app
 BINARY=terraform-provider-${PKG_NAME}
 OS_ARCH=darwin_amd64
-TFPLUGINDOCS_VERSION=v0.14.1
 
 default: build
 
-tools:
-	GO111MODULE=on go install github.com/client9/misspell/cmd/misspell
-	GO111MODULE=on go install github.com/golangci/golangci-lint/cmd/golangci-lint
-	GO111MODULE=on go install github.com/bflad/tfproviderlint/cmd/tfproviderlint
-
 build: fmtcheck
 	go install
 	go build -o ${BINARY}
@@ -31,7 +25,7 @@ fmtcheck:
 
 lint:
 	@echo "==> Checking source code against linters..."
-	golangci-lint run ./...
+	go tool golangci-lint run ./...
 
 test: fmtcheck
 	go test -i $(TEST) || exit 1
@@ -58,13 +52,8 @@ vet:
 		exit 1; \
 	fi
 
-docs-prepare:
-	@echo "==> Setting up tfplugindocs..."
-	go install github.com/hashicorp/terraform-plugin-docs/cmd/tfplugindocs@${TFPLUGINDOCS_VERSION}
-
-docs: docs-prepare
+docs:
 	@echo "==> Generating Provider Documentation..."
-	tfplugindocs generate
-
-.PHONY: build test testacc vet fmt fmtcheck lint tools test-compile docs docs-prepare
+	go tool tfplugindocs generate
 
+.PHONY: build test testacc vet fmt fmtcheck lint test-compile docs docs-prepare

codefresh.yml

@@ -39,7 +39,7 @@ steps:
       # The following will resolve to their latest patch version
       environment:
         - TF_VERSION=1.3.0
-        - TF_VERSION=1.7.0
+        - TF_VERSION=1.11.4
     when:
       condition:
         all:

codefresh/cfclient/account.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/imdario/mergo"
+	"dario.cat/mergo"
 )
 
 type DockerRegistry struct {

codefresh/cfclient/client.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"strings"
 )
@@ -71,7 +71,7 @@ func (client *Client) RequestAPI(opt *RequestOptions) ([]byte, error) {
 	}
 	defer resp.Body.Close()
 
-	body, err := ioutil.ReadAll(resp.Body)
+	body, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return nil, fmt.Errorf("Failed to read body %v %v", resp.StatusCode, resp.Status)
 	}
@@ -103,7 +103,7 @@ func (client *Client) RequestApiXAccessToken(opt *RequestOptions) ([]byte, error
 	}
 	defer resp.Body.Close()
 
-	body, err := ioutil.ReadAll(resp.Body)
+	body, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return nil, fmt.Errorf("Failed to read body %v %v", resp.StatusCode, resp.Status)
 	}

codefresh/cfclient/gql_client.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"errors"
-	"io/ioutil"
+	"io"
 	"net/http"
 )
 
@@ -38,7 +38,7 @@ func (client *Client) SendGqlRequest(request GraphQLRequest) ([]byte, error) {
 		return nil, err
 	}
 	if resp.StatusCode >= 400 {
-		bodyBytes, _ := ioutil.ReadAll(resp.Body)
+		bodyBytes, _ := io.ReadAll(resp.Body)
 		return nil, errors.New(resp.Status + " " + string(bodyBytes))
 	}
 	defer resp.Body.Close()

codefresh/internal/datautil/yaml.go

@@ -1,9 +1,8 @@
 package datautil
 
 import (
-	"io/ioutil"
+	"io"
 	"strings"
-
 	"github.com/mikefarah/yq/v4/pkg/yqlib"
 	"gopkg.in/op/go-logging.v1"
 )
@@ -24,7 +23,7 @@ func Yq(yamlString string, expression string, outputformat string) (string, erro
 	yqEvaluator := yqlib.NewStringEvaluator()
 
 	// Disable yq logging
-	yqLogBackend := logging.AddModuleLevel(logging.NewLogBackend(ioutil.Discard, "", 0))
+	yqLogBackend := logging.AddModuleLevel(logging.NewLogBackend(io.Discard, "", 0))
 	yqlib.GetLogger().SetBackend(yqLogBackend)
 
 	yamlString, err := yqEvaluator.Evaluate(yamlString, expression, yqEncoder, yqDecoder)

codefresh/resource_step_types_test.go

@@ -2,7 +2,6 @@ package codefresh
 
 import (
 	"fmt"
-	"io/ioutil"
 	"log"
 	"os"
 	"regexp"
@@ -49,7 +48,7 @@ func TestCleanUpStepFromTransientValues(t *testing.T) {
 
 func TestNormalizeYamlStringStepTypes(t *testing.T) {
 	testFile := "../test_data/step_types/testStepWithRuntimeData.yaml"
-	yamlString, err := ioutil.ReadFile(testFile)
+	yamlString, err := os.ReadFile(testFile)
 	if err != nil {
 		t.Errorf("Unable to open test file  %s. Err: #%v ", testFile, err)
 	}
@@ -85,7 +84,7 @@ func TestSortVersions(t *testing.T) {
 
 func TestExtractSteps(t *testing.T) {
 	testFile := "../test_data/step_types/testStepTypesOrder.yaml"
-	yamlString, err := ioutil.ReadFile(testFile)
+	yamlString, err := os.ReadFile(testFile)
 	if err != nil {
 		t.Errorf("Unable to read file %s", testFile)
 	}
@@ -112,11 +111,11 @@ func TestAccCodefreshStepTypes(t *testing.T) {
 		}
 		name := accountName + "/" + stepTypesNamePrefix + acctest.RandString(10)
 		resourceName := "codefresh_step_types.test"
-		contentStepsV1, err := ioutil.ReadFile("../test_data/step_types/testSteps.yaml")
+		contentStepsV1, err := os.ReadFile("../test_data/step_types/testSteps.yaml")
 		if err != nil {
 			log.Fatal(err)
 		}
-		contentStepsV2, err := ioutil.ReadFile("../test_data/step_types/testStepsTemplate.yaml")
+		contentStepsV2, err := os.ReadFile("../test_data/step_types/testStepsTemplate.yaml")
 		if err != nil {
 			log.Fatal(err)
 		}

docs/data-sources/account_gitops_settings.md

@@ -23,5 +23,3 @@ This data source retrieves gitops settings for the active account
 - `id` (String) Account Id
 - `name` (String) Account name for active account
 - `shared_config_repository` (String) Shared config repository url
-
-

docs/data-sources/account_idp.md

@@ -28,5 +28,3 @@ This data source retrieves an account level identity provider
 - `login_url` (String) Login url using the IDP to Codefresh
 - `redirect_ui_url` (String) UI Callback url for the identity provider
 - `redirect_url` (String) API Callback url for the identity provider
-
-

docs/data-sources/current_account.md

@@ -69,8 +69,5 @@ current_ac = {
 Required:
 
 - `email` (String)
-- `name` (String)
-
-Read-Only:
-
-- `id` (String) The ID of this resource.
+- `id` (String)
+- `name` (String)

docs/data-sources/current_account_user.md

@@ -23,5 +23,3 @@ Returns a user the current Codefresh account by name or email.
 ### Read-Only
 
 - `id` (String) The ID of this resource.
-
-

docs/data-sources/pipelines.md

@@ -35,5 +35,3 @@ Read-Only:
 - `project` (String)
 - `spec` (String)
 - `tags` (List of String)
-
-

docs/data-sources/service_account.md

@@ -25,5 +25,3 @@ This data source retrieves a Codefresh service account by its ID or name.
 ### Read-Only
 
 - `id` (String) The ID of this resource.
-
-

docs/resources/api_key.md

@@ -3,8 +3,8 @@ page_title: "codefresh_api_key Resource - terraform-provider-codefresh"
 subcategory: ""
 description: |-
   Manages an API Key tied to a user within an account or a service account within the current account.
-      On the Codefresh SaaS platfrom this resource is only usable for service accounts.
-      Management of API keys for users in other accounts requires admin priveleges and hence can only be done on Codefresh on-premises installations.
+  	On the Codefresh SaaS platfrom this resource is only usable for service accounts.
+  	Management of API keys for users in other accounts requires admin priveleges and hence can only be done on Codefresh on-premises installations.
 ---
 
 # codefresh_api_key (Resource)

docs/resources/pipeline.md

@@ -205,7 +205,7 @@ Optional:
 
 Read-Only:
 
-- `id` (String) The ID of this resource.
+- `id` (String)
 
 
 <a id="nestedblock--spec--options"></a>

go.mod

@@ -1,19 +1,17 @@
 module github.com/codefresh-io/terraform-provider-codefresh
 
 require (
+	dario.cat/mergo v1.0.2
 	github.com/Masterminds/semver v1.5.0
-	github.com/bflad/tfproviderdocs v0.12.1
 	github.com/bflad/tfproviderlint v0.31.0
 	github.com/cenkalti/backoff v2.2.1+incompatible
-	github.com/client9/misspell v0.3.4
 	github.com/dlclark/regexp2 v1.11.5
 	github.com/ghodss/yaml v1.0.0
 	github.com/golangci/golangci-lint v1.64.8
 	github.com/hashicorp/go-cty v1.5.0
 	github.com/hashicorp/terraform-plugin-sdk v1.17.2
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.36.1
 	github.com/iancoleman/orderedmap v0.3.0
-	github.com/imdario/mergo v0.3.15
 	github.com/mikefarah/yq/v4 v4.45.3
 	github.com/robfig/cron v1.2.0
 	github.com/stretchr/objx v0.5.2
@@ -34,6 +32,7 @@ require (
 	github.com/Crocmagnon/fatcontext v0.7.1 // indirect
 	github.com/Djarvur/go-err113 v0.1.0 // indirect
 	github.com/GaijinEntertainment/go-exhaustruct/v3 v3.3.1 // indirect
+	github.com/Kunde21/markdownfmt/v3 v3.1.0 // indirect
 	github.com/Masterminds/goutils v1.1.1 // indirect
 	github.com/Masterminds/semver/v3 v3.3.0 // indirect
 	github.com/Masterminds/sprig/v3 v3.2.3 // indirect
@@ -56,7 +55,7 @@ require (
 	github.com/bgentry/speakeasy v0.1.0 // indirect
 	github.com/bkielbasa/cyclop v1.2.3 // indirect
 	github.com/blizzy78/varnamelen v0.8.0 // indirect
-	github.com/bmatcuk/doublestar v1.3.4 // indirect
+	github.com/bmatcuk/doublestar/v4 v4.8.1 // indirect
 	github.com/bombsimon/wsl/v4 v4.5.0 // indirect
 	github.com/breml/bidichk v0.3.2 // indirect
 	github.com/breml/errchkjson v0.4.0 // indirect
@@ -111,6 +110,7 @@ require (
 	github.com/gostaticanalysis/comment v1.5.0 // indirect
 	github.com/gostaticanalysis/forcetypeassert v0.2.0 // indirect
 	github.com/gostaticanalysis/nilerr v0.1.1 // indirect
+	github.com/hashicorp/cli v1.1.7 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-checkpoint v0.5.0 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
@@ -128,13 +128,15 @@ require (
 	github.com/hashicorp/logutils v1.0.0 // indirect
 	github.com/hashicorp/terraform-exec v0.22.0 // indirect
 	github.com/hashicorp/terraform-json v0.24.0 // indirect
+	github.com/hashicorp/terraform-plugin-docs v0.21.0 // indirect
 	github.com/hashicorp/terraform-plugin-go v0.26.0 // indirect
 	github.com/hashicorp/terraform-plugin-log v0.9.0 // indirect
 	github.com/hashicorp/terraform-registry-address v0.2.4 // indirect
 	github.com/hashicorp/terraform-svchost v0.1.1 // indirect
 	github.com/hashicorp/yamux v0.1.1 // indirect
 	github.com/hexops/gotextdiff v1.0.3 // indirect
 	github.com/huandu/xstrings v1.4.0 // indirect
+	github.com/imdario/mergo v0.3.15 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/jgautheron/goconst v1.7.1 // indirect
 	github.com/jingyugao/rowserrcheck v1.1.1 // indirect
@@ -163,7 +165,6 @@ require (
 	github.com/mattn/go-runewidth v0.0.16 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/mgechev/revive v1.7.0 // indirect
-	github.com/mitchellh/cli v1.1.5 // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/mitchellh/go-testing-interface v1.14.1 // indirect
@@ -233,18 +234,20 @@ require (
 	github.com/yagipy/maintidx v1.0.0 // indirect
 	github.com/yeya24/promlinter v0.3.0 // indirect
 	github.com/ykadowak/zerologlint v0.1.5 // indirect
-	github.com/yuin/goldmark v1.5.4 // indirect
+	github.com/yuin/goldmark v1.7.7 // indirect
 	github.com/yuin/goldmark-meta v1.1.0 // indirect
 	github.com/yuin/gopher-lua v1.1.1 // indirect
 	github.com/zclconf/go-cty v1.16.2 // indirect
 	gitlab.com/bosi/decorder v0.4.2 // indirect
 	go-simpler.org/musttag v0.13.0 // indirect
 	go-simpler.org/sloglint v0.9.0 // indirect
+	go.abhg.dev/goldmark/frontmatter v0.2.0 // indirect
 	go.uber.org/atomic v1.10.0 // indirect
 	go.uber.org/automaxprocs v1.6.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.24.0 // indirect
 	golang.org/x/crypto v0.38.0 // indirect
+	golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
 	golang.org/x/exp/typeparams v0.0.0-20250210185358-939b2ce775ac // indirect
 	golang.org/x/mod v0.24.0 // indirect
 	golang.org/x/net v0.40.0 // indirect
@@ -266,3 +269,9 @@ require (
 go 1.24
 
 toolchain go1.24.2
+
+tool (
+	github.com/bflad/tfproviderlint/cmd/tfproviderlint
+	github.com/golangci/golangci-lint/cmd/golangci-lint
+	github.com/hashicorp/terraform-plugin-docs/cmd/tfplugindocs
+)