Upgrade ArgoCD API client to 1.8.3 (#28)

.github/workflows/tests.yml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        argocd_version: ["v.1.8.2", "v1.7.11", "v1.6.2"]
+        argocd_version: ["v.1.8.3", "v1.7.11", "v1.6.2"]
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v1

README.md

@@ -323,7 +323,7 @@ make testacc_clean_env
 
 For example if you use Docker as your local container runtime:
 ```shell
-docker pull argoproj/argocd:v1.8.2
+docker pull argoproj/argocd:v1.8.3
 docker pull ghcr.io/dexidp/dex:v2.27.0
 docker pull redis:5.0.10-alpine
 ```

argocd/provider.go

@@ -10,7 +10,7 @@ import (
 	"github.com/argoproj/argo-cd/pkg/apiclient/repocreds"
 	"github.com/argoproj/argo-cd/pkg/apiclient/repository"
 	"github.com/argoproj/argo-cd/pkg/apiclient/session"
-	util "github.com/argoproj/gitops-engine/pkg/utils/io"
+	"github.com/argoproj/argo-cd/util/io"
 	"github.com/golang/protobuf/ptypes/empty"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/terraform"
@@ -161,7 +161,7 @@ func initServerInterface(
 	if err != nil {
 		return nil, err
 	}
-	defer util.Close(acCloser)
+	defer io.Close(acCloser)
 
 	serverVersionMessage, err := versionClient.Version(context.Background(), &empty.Empty{})
 	if err != nil {
@@ -241,7 +241,7 @@ func initApiClient(d *schema.ResourceData) (
 			if err != nil {
 				return apiClient, err
 			}
-			defer util.Close(closer)
+			defer io.Close(closer)
 			sessionOpts := session.SessionCreateRequest{
 				Username: userName.(string),
 				Password: password.(string),

argocd/utils.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"github.com/argoproj/argo-cd/pkg/apiclient"
 	application "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
-	util "github.com/argoproj/gitops-engine/pkg/utils/io"
+	"github.com/argoproj/argo-cd/util/io"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"regexp"
 	"strconv"
@@ -126,7 +126,7 @@ func isValidToken(token *application.JWTToken, expiresIn int64) error {
 	if err != nil {
 		return err
 	}
-	defer util.Close(closer)
+	defer io.Close(closer)
 	return nil
 }
 

go.mod

@@ -1,42 +1,46 @@
 module github.com/oboukili/terraform-provider-argocd
 
-go 1.14
+go 1.15
 
 require (
 	github.com/Masterminds/semver v1.5.0
-	github.com/argoproj/argo-cd v1.6.2
-	github.com/argoproj/gitops-engine v0.1.3
-	github.com/argoproj/pkg v0.0.0-20200319004004-f46beff7cd54
-	github.com/cristalhq/jwt/v3 v3.0.2
-	github.com/golang/protobuf v1.3.4
-	github.com/hashicorp/terraform-plugin-sdk v1.14.0
+	github.com/argoproj/argo-cd v1.8.3
+	github.com/argoproj/pkg v0.2.0
+	github.com/cristalhq/jwt/v3 v3.0.8
+	github.com/golang/protobuf v1.4.3
+	github.com/hashicorp/terraform-plugin-sdk v1.16.0
 	github.com/robfig/cron v1.1.0
-	github.com/stretchr/testify v1.5.1
-	golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586
-	k8s.io/apimachinery v0.16.6
+	github.com/stretchr/testify v1.6.1
+	golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
+	k8s.io/apimachinery v0.19.2
 	modernc.org/mathutil v1.0.0
 )
 
 replace (
-	k8s.io/api => k8s.io/api v0.16.6
-	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.16.6
-	k8s.io/apimachinery => k8s.io/apimachinery v0.16.6
-	k8s.io/apiserver => k8s.io/apiserver v0.16.6
-	k8s.io/cli-runtime => k8s.io/cli-runtime v0.16.6
-	k8s.io/client-go => k8s.io/client-go v0.16.6
-	k8s.io/cloud-provider => k8s.io/cloud-provider v0.16.6
-	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.16.6
-	k8s.io/code-generator => k8s.io/code-generator v0.16.6
-	k8s.io/component-base => k8s.io/component-base v0.16.6
-	k8s.io/cri-api => k8s.io/cri-api v0.16.6
-	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.16.6
-	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.16.6
-	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.16.6
-	k8s.io/kube-proxy => k8s.io/kube-proxy v0.16.6
-	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.16.6
-	k8s.io/kubectl => k8s.io/kubectl v0.16.6
-	k8s.io/kubelet => k8s.io/kubelet v0.16.6
-	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.16.6
-	k8s.io/metrics => k8s.io/metrics v0.16.6
-	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.16.6
+	github.com/golang/protobuf => github.com/golang/protobuf v1.4.2
+	github.com/gorilla/websocket => github.com/gorilla/websocket v1.4.2
+	github.com/grpc-ecosystem/grpc-gateway => github.com/grpc-ecosystem/grpc-gateway v1.12.2
+	github.com/improbable-eng/grpc-web => github.com/improbable-eng/grpc-web v0.0.0-20181111100011-16092bd1d58a
+
+	k8s.io/api => k8s.io/api v0.19.2
+	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.19.2
+	k8s.io/apimachinery => k8s.io/apimachinery v0.19.2
+	k8s.io/apiserver => k8s.io/apiserver v0.19.2
+	k8s.io/cli-runtime => k8s.io/cli-runtime v0.19.2
+	k8s.io/client-go => k8s.io/client-go v0.19.2
+	k8s.io/cloud-provider => k8s.io/cloud-provider v0.19.2
+	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.19.2
+	k8s.io/code-generator => k8s.io/code-generator v0.19.2
+	k8s.io/component-base => k8s.io/component-base v0.19.2
+	k8s.io/cri-api => k8s.io/cri-api v0.19.2
+	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.19.2
+	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.19.2
+	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.19.2
+	k8s.io/kube-proxy => k8s.io/kube-proxy v0.19.2
+	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.19.2
+	k8s.io/kubectl => k8s.io/kubectl v0.19.2
+	k8s.io/kubelet => k8s.io/kubelet v0.19.2
+	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.19.2
+	k8s.io/metrics => k8s.io/metrics v0.19.2
+	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.19.2
 )