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)