Merge pull request #187 from prudhvigodithi/main

Project go upgrade to 1.22
opensearch-project · May 7, 2024 · 3699cfb · 3699cfb
2 parents bdfb6d1 + 23b05e5
commit 3699cfb
Show file tree

Hide file tree

Showing 18 changed files with 283 additions and 780 deletions.
diff --git a/.github/workflows/add-untriaged.yml b/.github/workflows/add-untriaged.yml
@@ -1,19 +1,19 @@
-name: Apply 'untriaged' label during issue lifecycle
-
-on:
-  issues:
-    types: [opened, reopened, transferred]
-
-jobs:
-  apply-label:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/github-script@v6
-        with:
-          script: |
-            github.rest.issues.addLabels({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              labels: ['untriaged']
-            })
+name: Apply 'untriaged' label during issue lifecycle
+
+on:
+  issues:
+    types: [opened, reopened, transferred]
+
+jobs:
+  apply-label:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/github-script@v6
+        with:
+          script: |
+            github.rest.issues.addLabels({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              labels: ['untriaged']
+            })
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -8,10 +8,10 @@ jobs:
     name: Runs go linters
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/setup-go@v3
+    - uses: actions/setup-go@v5
       with:
-        go-version: 1.17
-    - uses: actions/checkout@v3
+        go-version: 1.22.1
+    - uses: actions/checkout@v4
       with:
         # we depend on full git history for linters
         fetch-depth: 0
@@ -26,7 +26,7 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [1.18.x]
+        go-version: [1.22.1]
         os: [ubuntu-latest]
         os-major-version:
           - "2-opensearch"
@@ -50,11 +50,11 @@ jobs:
       run: |
         sudo sysctl -w vm.max_map_count=262144
     - name: Setup Go ${{ matrix.go-version }}
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v5
       with:
         go-version: ${{ matrix.go-version }}
     - name: Checkout code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         # we depend on full git history for linters
         fetch-depth: 0
@@ -76,18 +76,21 @@ jobs:
     - name: Check Docker containers
       run: docker ps -a
     # While docker/OS is booting up, run the linters
-    - name: Get tools
-      run: |
-        ./script/install-tools
     - name: Install managed version of terraform
-      uses: hashicorp/setup-terraform@v1
+      uses: hashicorp/setup-terraform@v3
       with:
-        terraform_version: 1.0.11
+        terraform_version: 1.1.7
         terraform_wrapper: false
+    - name: Terraform fmt
+      id: fmt
+      run: terraform fmt -check
+      continue-on-error: false
+    - name: Terraform Validate
+      id: validate
+      run: terraform validate -no-color
     - name: Run check scripts
       run: |
         ./script/test-mod-tidy
-        ./script/test-terraform-fmt
     - name: Wait for OpenSearch
       # ensure that OS has come up and is available
       run: |
@@ -109,9 +112,9 @@ jobs:
     name: Release
     steps:
     - name: Checkout code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
     - name: Setup Go
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v5
       with:
         go-version: 1.18.x
     - name: Import GPG key

diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,3 @@
 /vendor
 .DS_Store
-terraform-provider-opensearch
+terraform-provider-opensearch
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -19,4 +19,4 @@ This code of conduct applies to all spaces provided by the OpenSource project in
 * Advocating for or encouraging any of the above behaviors.
 * Enforcement and Reporting Code of Conduct Issues:
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported. [Contact us](mailto:[email protected]). All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported. [Contact us](mailto:[email protected]). All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances.
diff --git a/NOTICE b/NOTICE
@@ -1,2 +1,2 @@
 OpenSearch (https://opensearch.org/)
-Copyright OpenSearch Contributors
+Copyright OpenSearch Contributors
diff --git a/docs/index.md b/docs/index.md
@@ -113,10 +113,10 @@ Example usage:
 
 ```tf
 provider "opensearch" {
-    url            = "https://search-foo-bar-pqrhr4w3u4dzervg41frow4mmy.us-east-1.es.amazonaws.com"
-    aws_access_key = "anaccesskey"
-    aws_secret_key = "asecretkey"
-    aws_token      = "" # if necessary
+  url            = "https://search-foo-bar-pqrhr4w3u4dzervg41frow4mmy.us-east-1.es.amazonaws.com"
+  aws_access_key = "anaccesskey"
+  aws_secret_key = "asecretkey"
+  aws_token      = "" # if necessary
 }
 ```
 
@@ -128,11 +128,11 @@ Example usage:
 
 ```tf
 provider "opensearch" {
-    url               = "https://search-foo-bar-pqrhr4w3u4dzervg41frow4mmy.us-east-1.es.amazonaws.com"
-    username          = "ausername"
-    password          = "apassword"
-    # Must be disabled for basic auth
-    sign_aws_requests = false
+  url      = "https://search-foo-bar-pqrhr4w3u4dzervg41frow4mmy.us-east-1.es.amazonaws.com"
+  username = "ausername"
+  password = "apassword"
+  # Must be disabled for basic auth
+  sign_aws_requests = false
 }
 ```
 
@@ -145,9 +145,9 @@ Example usage:
 
 ```tf
 provider "opensearch" {
-    url                         = "https://search-foo-bar-pqrhr4w3u4dzervg41frow4mmy.us-east-1.es.amazonaws.com"
-    aws_assume_role_arn         = "arn:aws:iam::012345678901:role/rolename"
-    aws_assume_role_external_id = "SecretID"
+  url                         = "https://search-foo-bar-pqrhr4w3u4dzervg41frow4mmy.us-east-1.es.amazonaws.com"
+  aws_assume_role_arn         = "arn:aws:iam::012345678901:role/rolename"
+  aws_assume_role_external_id = "SecretID"
 }
 ```
 
@@ -169,8 +169,8 @@ You can specify a named profile that will be used for credentials (either static
 
 ```tf
 provider "opensearch" {
-    url         = "https://search-foo-bar-pqrhr4w3u4dzervg41frow4mmy.us-east-1.es.amazonaws.com"
-    aws_profile = "profilename"
+  url         = "https://search-foo-bar-pqrhr4w3u4dzervg41frow4mmy.us-east-1.es.amazonaws.com"
+  aws_profile = "profilename"
 }
 ```
 

diff --git a/go.mod b/go.mod
@@ -1,16 +1,74 @@
 module github.com/opensearch-project/terraform-provider-opensearch
 
-go 1.14
+go 1.22.1
 
 require (
-	github.com/aws/aws-sdk-go v1.45.24
+	github.com/aws/aws-sdk-go v1.52.2
 	github.com/deoxxa/aws_signing_client v0.0.0-20161109131055-c20ee106809e
-	github.com/hashicorp/go-hclog v1.5.0
-	github.com/hashicorp/terraform-plugin-docs v0.13.0
-	github.com/hashicorp/terraform-plugin-sdk/v2 v2.12.0
-	github.com/katbyte/terrafmt v0.4.0
+	github.com/hashicorp/go-hclog v1.6.3
+	github.com/hashicorp/terraform-plugin-sdk/v2 v2.33.0
 	github.com/mitchellh/go-homedir v1.1.0
-	github.com/olivere/elastic v6.2.26+incompatible
+	github.com/olivere/elastic v6.2.37+incompatible
 	github.com/olivere/elastic/v7 v7.0.32
 	gopkg.in/olivere/elastic.v6 v6.2.37
 )
+
+require (
+	github.com/ProtonMail/go-crypto v1.1.0-alpha.2-proton // indirect
+	github.com/agext/levenshtein v1.2.3 // indirect
+	github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
+	github.com/cloudflare/circl v1.3.8 // indirect
+	github.com/fatih/color v1.16.0 // indirect
+	github.com/golang/protobuf v1.5.4 // indirect
+	github.com/google/go-cmp v0.6.0 // 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
+	github.com/hashicorp/go-cty v1.4.1-0.20200723130312-85980079f637 // indirect
+	github.com/hashicorp/go-multierror v1.1.1 // indirect
+	github.com/hashicorp/go-plugin v1.6.0 // indirect
+	github.com/hashicorp/go-uuid v1.0.3 // indirect
+	github.com/hashicorp/go-version v1.6.0 // indirect
+	github.com/hashicorp/hc-install v0.6.4 // indirect
+	github.com/hashicorp/hcl/v2 v2.20.1 // indirect
+	github.com/hashicorp/logutils v1.0.0 // indirect
+	github.com/hashicorp/terraform-exec v0.20.0 // indirect
+	github.com/hashicorp/terraform-json v0.21.0 // indirect
+	github.com/hashicorp/terraform-plugin-go v0.22.2 // indirect
+	github.com/hashicorp/terraform-plugin-log v0.9.0 // indirect
+	github.com/hashicorp/terraform-registry-address v0.2.3 // indirect
+	github.com/hashicorp/terraform-svchost v0.1.1 // indirect
+	github.com/hashicorp/yamux v0.1.1 // indirect
+	github.com/jmespath/go-jmespath v0.4.0 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
+	github.com/kr/pretty v0.3.0 // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/mitchellh/copystructure v1.2.0 // indirect
+	github.com/mitchellh/go-testing-interface v1.14.1 // indirect
+	github.com/mitchellh/go-wordwrap v1.0.1 // indirect
+	github.com/mitchellh/mapstructure v1.5.0 // indirect
+	github.com/mitchellh/reflectwalk v1.0.2 // indirect
+	github.com/oklog/run v1.1.0 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/rogpeppe/go-internal v1.12.0 // indirect
+	github.com/stretchr/testify v1.8.2 // indirect
+	github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
+	github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
+	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
+	github.com/zclconf/go-cty v1.14.4 // indirect
+	golang.org/x/crypto v0.23.0 // indirect
+	golang.org/x/mod v0.17.0 // indirect
+	golang.org/x/net v0.25.0 // indirect
+	golang.org/x/sync v0.7.0 // indirect
+	golang.org/x/sys v0.20.0 // indirect
+	golang.org/x/text v0.15.0 // indirect
+	golang.org/x/tools v0.20.0 // indirect
+	google.golang.org/appengine v1.6.8 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240429193739-8cf5692501f6 // indirect
+	google.golang.org/grpc v1.63.2 // indirect
+	google.golang.org/protobuf v1.34.1 // indirect
+	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+)