Merge branch 'main' into revise-license

aminueza · Nov 5, 2023 · 5ed283c · 5ed283c
2 parents 5972e64 + 1919016
commit 5ed283c
Show file tree

Hide file tree

Showing 35 changed files with 3,517 additions and 94 deletions.
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -7,7 +7,7 @@ Contributions are what make the open source community such an amazing place to b
 2. Create your Feature Branch (`git checkout -b feature/TerraformFeature`)
 3. Commit your Changes (`git commit -m 'Add some TerraformFeature'`)
 4. Push to the Branch (`git push origin feature/TerraformFeature`)
-5. Open a [Pull Request](https://github.com/terraform-provider-minio/terraform-provider-minio/pulls)
+5. Open a [Pull Request](https://github.com/aminueza/terraform-provider-minio/pulls)
 
 ### Merging
 

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -2,13 +2,12 @@ name: Docs CI
 on:
   push:
     branches:
-      - master
-      - feature/**
+      - main
     tags:
-      - 'v*'
+      - "v*"
   pull_request:
     branches:
-      - master
+      - main
 jobs:
   mdvalidate:
     name: Validate Markdown Files
@@ -20,7 +19,7 @@ jobs:
       - name: Check out code
         uses: actions/checkout@v4
         with:
-            fetch-depth: 1
+          fetch-depth: 1
 
       - name: Markdown Link Validation
         uses: gaurav-nelson/github-action-markdown-link-check@v1
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -1,9 +1,9 @@
 name: Terraform Provider CI
 on:
   push:
-    branches: [master]
+    branches: [main]
   pull_request:
-    branches: [master]
+    branches: [main]
 jobs:
   checkup:
     name: Checkup
@@ -35,7 +35,7 @@ jobs:
           version: "2023.1.6"
           install-go: false
       - name: Build the docker-compose stack
-        run: docker-compose up -d minio
+        run: docker-compose up -d minio secondminio thirdminio fourthminio
       - uses: hashicorp/setup-terraform@v2
         with:
           terraform_version: 1.4.7
@@ -48,4 +48,4 @@ jobs:
       - name: Run install task
         run: task install
       - name: Run test task
-        run: task test
+        run: sudo apt install jq -y && sed "s/172.17.0.1/`docker network inspect bridge | jq -r .[].IPAM.Config[].Gateway`/" Taskfile.yml && task test
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -14,6 +14,8 @@ on:
   push:
     tags:
       - "v*"
+permissions:
+  contents: write
 jobs:
   goreleaser:
     runs-on: ubuntu-latest
@@ -33,7 +35,7 @@ jobs:
           gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
           passphrase: ${{ secrets.PASSPHRASE }}
       - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v4
+        uses: goreleaser/goreleaser-action@v5
         with:
           version: latest
           args: release --rm-dist

diff --git a/.gitignore b/.gitignore
@@ -19,4 +19,5 @@ plan.bin
 #go packages
 vendor/*
 .vscode
-.idea
+.idea
+dev.tfrc
diff --git a/README.md b/README.md
@@ -1,24 +1,24 @@
 <p align="center">
-  <a href="https://github.com/terraform-provider-minio/terraform-provider-minio">
+  <a href="https://github.com/aminueza/terraform-provider-minio">
     <img src="https://i.imgur.com/yijdDec.png" alt="minio-provider-terraform" width="200">
   </a>
   <h3 align="center" style="font-weight: bold">Terraform Provider for MinIO</h3>
   <p align="center">
-    <a href="https://github.com/terraform-provider-minio/terraform-provider-minio/graphs/contributors">
-      <img alt="Contributors" src="https://img.shields.io/github/contributors/terraform-provider-minio/terraform-provider-minio">
+    <a href="https://github.com/aminueza/terraform-provider-minio/graphs/contributors">
+      <img alt="Contributors" src="https://img.shields.io/github/contributors/aminueza/terraform-provider-minio">
     </a>
     <a href="https://golang.org/doc/devel/release.html">
-      <img alt="GitHub go.mod Go version" src="https://img.shields.io/github/go-mod/go-version/terraform-provider-minio/terraform-provider-minio">
+      <img alt="GitHub go.mod Go version" src="https://img.shields.io/github/go-mod/go-version/aminueza/terraform-provider-minio">
     </a>
-    <a href="https://github.com/terraform-provider-minio/terraform-provider-minio/actions?query=workflow%3A%22Terraform+Provider+CI%22">
-      <img alt="GitHub Workflow Status" src="https://img.shields.io/github/actions/workflow/status/terraform-provider-minio/terraform-provider-minio/go.yml?branch=master">
+    <a href="https://github.com/aminueza/terraform-provider-minio/actions?query=workflow%3A%22Terraform+Provider+CI%22">
+      <img alt="GitHub Workflow Status" src="https://img.shields.io/github/actions/workflow/status/aminueza/terraform-provider-minio/go.yml?branch=main">
     </a>
-    <a href="https://github.com/terraform-provider-minio/terraform-provider-minio/releases">
-      <img alt="GitHub release (latest by date including pre-releases)" src="https://img.shields.io/github/v/release/terraform-provider-minio/terraform-provider-minio?include_prereleases">
+    <a href="https://github.com/aminueza/terraform-provider-minio/releases">
+      <img alt="GitHub release (latest by date including pre-releases)" src="https://img.shields.io/github/v/release/aminueza/terraform-provider-minio?include_prereleases">
     </a>
   </p>
   <p align="center">
-    <a href="https://github.com/terraform-provider-minio/terraform-provider-minio/tree/master/docs"><strong>Explore the docs »</strong></a>
+    <a href="https://github.com/aminueza/terraform-provider-minio/tree/main/docs"><strong>Explore the docs »</strong></a>
   </p>
 </p>
 
@@ -51,7 +51,7 @@ It just means that we can't guarantee backward compatibility.
 
 ## Building and Installing
 
-Prebuilt versions of this provider are available on the [releases page](https://github.com/terraform-provider-minio/terraform-provider-minio/releases/latest).
+Prebuilt versions of this provider are available on the [releases page](https://github.com/aminueza/terraform-provider-minio/releases/latest).
 
 But if you need to build it yourself, just download this repository, [install](https://taskfile.dev/#/installation) [Task](https://taskfile.dev/):
 
@@ -118,7 +118,7 @@ See our [examples](./examples/) folder.
 
 ## Roadmap
 
-See the [open issues](https://github.com/terraform-provider-minio/terraform-provider-minio/issues) for a list of proposed features (and known issues). See [CONTRIBUTING](./.github/CONTRIBUTING.md) for more information.
+See the [open issues](https://github.com/aminueza/terraform-provider-minio/issues) for a list of proposed features (and known issues). See [CONTRIBUTING](./.github/CONTRIBUTING.md) for more information.
 
 ## License
 

diff --git a/Taskfile.yml b/Taskfile.yml
@@ -52,10 +52,22 @@ tasks:
     desc: Run the package tests.
     env: 
       TF_ACC: 0
-      MINIO_ENDPOINT: localhost:9000
+      MINIO_ENDPOINT: 172.17.0.1:9000
       MINIO_USER: minio
       MINIO_PASSWORD: minio123
       MINIO_ENABLE_HTTPS: false
+      SECOND_MINIO_ENDPOINT: 172.17.0.1:9002
+      SECOND_MINIO_USER: minio
+      SECOND_MINIO_PASSWORD: minio321
+      SECOND_MINIO_ENABLE_HTTPS: false
+      THIRD_MINIO_ENDPOINT: 172.17.0.1:9004
+      THIRD_MINIO_USER: minio
+      THIRD_MINIO_PASSWORD: minio456
+      THIRD_MINIO_ENABLE_HTTPS: false
+      FOURTH_MINIO_ENDPOINT: 172.17.0.1:9006
+      FOURTH_MINIO_USER: minio
+      FOURTH_MINIO_PASSWORD: minio654
+      FOURTH_MINIO_ENABLE_HTTPS: false
     cmds:
       - go test -v -cover ./minio
     silent: true
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   minio:
-    image: minio/minio:RELEASE.2023-03-13T19-46-17Z
+    image: minio/minio:RELEASE.2023-08-31T15-31-16Z
     ports:
       - "9000:9000"
       - "9001:9001"
@@ -12,12 +12,66 @@ services:
       MINIO_NOTIFY_WEBHOOK_ENABLE_primary: "on"
       MINIO_NOTIFY_WEBHOOK_ENDPOINT_primary: https://webhook.example.com
     command: server --console-address :9001 /data{0...3}
+  secondminio: #  This is used to test bucket replication
+    image: minio/minio:RELEASE.2023-08-31T15-31-16Z
+    ports:
+      - "9002:9000"
+      - "9003:9001"
+    environment:
+      MINIO_ROOT_USER: minio
+      MINIO_ROOT_PASSWORD: minio321
+      MINIO_CI_CD: "1"
+      MINIO_NOTIFY_WEBHOOK_ENABLE_primary: "on"
+      MINIO_NOTIFY_WEBHOOK_ENDPOINT_primary: https://webhook.example.com
+    command: server --console-address :9001 /data{0...3}
+  thirdminio: #  This is used to test bucket replication
+    image: minio/minio:RELEASE.2023-08-31T15-31-16Z
+    ports:
+      - "9004:9000"
+      - "9005:9001"
+    environment:
+      MINIO_ROOT_USER: minio
+      MINIO_ROOT_PASSWORD: minio456
+      MINIO_CI_CD: "1"
+      MINIO_NOTIFY_WEBHOOK_ENABLE_primary: "on"
+      MINIO_NOTIFY_WEBHOOK_ENDPOINT_primary: https://webhook.example.com
+    command: server --console-address :9001 /data{0...3}
+  fourthminio: #  This is used to test bucket replication
+    image: minio/minio:RELEASE.2023-08-31T15-31-16Z
+    ports:
+      - "9006:9000"
+      - "9007:9001"
+    environment:
+      MINIO_ROOT_USER: minio
+      MINIO_ROOT_PASSWORD: minio654
+      MINIO_CI_CD: "1"
+      MINIO_NOTIFY_WEBHOOK_ENABLE_primary: "on"
+      MINIO_NOTIFY_WEBHOOK_ENDPOINT_primary: https://webhook.example.com
+    command: server --console-address :9001 /data{0...3}
   adminio-ui:
     image: rzrbld/adminio-ui:v1.93-210123
     environment:
       API_BASE_URL: "http://localhost:8080"
-      ADMINIO_MULTI_BACKEND: "false"
-      ADMINIO_BACKENDS: '[{"name":"myminio","url":"http://localhost:8080"},{"name":"localhost","url":"http://localhost:8081"},{"name":"error","url":"http://localhost:8082"}]'
+      ADMINIO_MULTI_BACKEND: "true"
+      ADMINIO_BACKENDS: |-
+        [
+          {
+            "name": "minio",
+            "url": "http://localhost:8080"
+          },
+          {
+            "name": "secondminio",
+            "url": "http://localhost:8081"
+          },
+          {
+            "name": "thirdminio",
+            "url": "http://localhost:8082"
+          },
+          {
+            "name": "fourthminio",
+            "url": "http://localhost:8083"
+          }
+        ]
       NGX_ROOT_PATH: "/"
     ports:
       - "8000:80"
@@ -34,3 +88,42 @@ services:
       - adminio-ui
     ports:
       - "8080:8080"
+  secondadminio-api:
+    image: rzrbld/adminio-api:v1.84-210123
+    environment:
+      MINIO_ACCESS: minio
+      MINIO_SECRET: minio321
+      MINIO_HOST_PORT: secondminio:9000
+      MINIO_KMS_MASTER_KEY: terraform-key:da2f4cfa32bed76507dcd44b42872328a8e14f25cd2a1ec0fb85d299a192a447
+      ADMINIO_HOST_PORT: :8080
+    depends_on:
+      - secondminio
+      - adminio-ui
+    ports:
+      - "8081:8080"
+  thirdadminio-api:
+    image: rzrbld/adminio-api:v1.84-210123
+    environment:
+      MINIO_ACCESS: minio
+      MINIO_SECRET: minio456
+      MINIO_HOST_PORT: thirdminio:9000
+      MINIO_KMS_MASTER_KEY: terraform-key:da2f4cfa32bed76507dcd44b42872328a8e14f25cd2a1ec0fb85d299a192a447
+      ADMINIO_HOST_PORT: :8080
+    depends_on:
+      - thirdminio
+      - adminio-ui
+    ports:
+      - "8082:8080"
+  fourthadminio-api:
+    image: rzrbld/adminio-api:v1.84-210123
+    environment:
+      MINIO_ACCESS: minio
+      MINIO_SECRET: minio654
+      MINIO_HOST_PORT: fourthminio:9000
+      MINIO_KMS_MASTER_KEY: terraform-key:da2f4cfa32bed76507dcd44b42872328a8e14f25cd2a1ec0fb85d299a192a447
+      ADMINIO_HOST_PORT: :8080
+    depends_on:
+      - fourthminio
+      - adminio-ui
+    ports:
+      - "8083:8080"
diff --git a/docs/resources/ilm_policy.md b/docs/resources/ilm_policy.md
@@ -46,6 +46,7 @@ Optional:
 
 - `expiration` (String)
 - `filter` (String)
+- `noncurrent_version_expiration_days` (Int)
 - `tags` (Map of String)
 
 Read-Only: