fix(DMVP-3754): Fixed providers and examples structure.

dasmeta · Apr 5, 2024 · 5526afb · 5526afb
1 parent c77866a
commit 5526afb
Show file tree

Hide file tree

Showing 18 changed files with 38 additions and 161 deletions.
diff --git a/modules/external-secret-store/providers.tf → modules/external-secret-store/versions.tf b/modules/external-secret-store/providers.tf → modules/external-secret-store/versions.tf
diff --git a/modules/gcp-secret/README.md b/modules/gcp-secret/README.md
diff --git a/modules/gcp-secret/examples/basic/README.md b/modules/gcp-secret/examples/basic/README.md
diff --git a/modules/gcp-secret/examples/basic/main.tf b/modules/gcp-secret/examples/basic/main.tf
diff --git a/modules/gcp-secret/examples/basic/provider.tf b/modules/gcp-secret/examples/basic/provider.tf
diff --git a/modules/gcp-secret/main.tf b/modules/gcp-secret/main.tf
diff --git a/modules/gcp-secret/outputs.tf b/modules/gcp-secret/outputs.tf
diff --git a/modules/gcp-secret/provider.tf b/modules/gcp-secret/provider.tf
diff --git a/modules/gcp-secret/variables.tf b/modules/gcp-secret/variables.tf
diff --git a/modules/keeper-to-secret-manager/README.md b/modules/keeper-to-secret-manager/README.md
@@ -50,7 +50,7 @@ No providers.
 | Name | Source | Version |
 |------|--------|---------|
 | <a name="module_keeper-reader"></a> [keeper-reader](#module\_keeper-reader) | dasmeta/shared/any//modules/keeper-reader | n/a |
-| <a name="module_secret"></a> [secret](#module\_secret) | ../gcp-secret | n/a |
+| <a name="module_secret"></a> [secret](#module\_secret) | dasmeta/modules/google//modules/secret | 1.4.0 |
 
 ## Resources
 

diff --git a/modules/keeper-to-secret-manager/examples/to-gcp/0-setup.tf b/modules/keeper-to-secret-manager/examples/to-gcp/0-setup.tf
@@ -0,0 +1,18 @@
+terraform {
+  required_providers {
+    secretsmanager = {
+      source  = "Keeper-Security/secretsmanager"
+      version = "1.1.3"
+    }
+  }
+}
+
+provider "google" {
+  project     = "my-project"
+  region      = "us-east1"
+  credentials = file("/path/to/gcp/config.json")
+}
+
+provider "secretsmanager" {
+  credential = file("/path/to/keeper/config.json")
+}
diff --git a/...to-secret-manager/examples/to-gcp/main.tf → ...cret-manager/examples/to-gcp/1-example.tf b/...to-secret-manager/examples/to-gcp/main.tf → ...cret-manager/examples/to-gcp/1-example.tf
diff --git a/modules/keeper-to-secret-manager/examples/to-gcp/README.md b/modules/keeper-to-secret-manager/examples/to-gcp/README.md
@@ -3,7 +3,9 @@
 <!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
 ## Requirements
 
-No requirements.
+| Name | Version |
+|------|---------|
+| <a name="requirement_secretsmanager"></a> [secretsmanager](#requirement\_secretsmanager) | 1.1.3 |
 
 ## Providers
 

diff --git a/modules/keeper-to-secret-manager/examples/to-gcp/provider.tf b/modules/keeper-to-secret-manager/examples/to-gcp/provider.tf
diff --git a/modules/keeper-to-secret-manager/main.tf b/modules/keeper-to-secret-manager/main.tf
@@ -2,14 +2,15 @@
 module "keeper-reader" {
   source = "dasmeta/shared/any//modules/keeper-reader"
 
-  keeper_credentials = var.keeper_credentials
-  secrets            = var.secrets
+  secrets = var.secrets
 }
 
 //This module writes module.keeper data into GCP secret manager, if var.secret_manager="gcp"
 module "secret" {
-  count  = var.secret_manager == "gcp" ? 1 : 0
-  source = "../gcp-secret"
+  count = var.secret_manager == "gcp" ? 1 : 0
+
+  source  = "dasmeta/modules/google//modules/secret"
+  version = "1.4.0"
 
   secrets = {
     for index, s in var.secrets : s.secret_name => s.secret_type == "login" ? module.keeper-reader.login_secrets[index][s.field] : s.secret_type == "db" ? module.keeper-reader.db_secrets[index][s.field] : module.keeper-reader.ssh_secrets[index][s.field]

diff --git a/modules/onepassword-to-secret-manager/README.md b/modules/onepassword-to-secret-manager/README.md
@@ -37,7 +37,9 @@ module "onepassword_to_secret_manager" {
 <!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
 ## Requirements
 
-No requirements.
+| Name | Version |
+|------|---------|
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 4.33 |
 
 ## Providers
 

diff --git a/modules/onepassword-to-secret-manager/examples/to-aws/0-setup.tf b/modules/onepassword-to-secret-manager/examples/to-aws/0-setup.tf
@@ -1,9 +1,5 @@
 terraform {
   required_providers {
-    test = {
-      source = "terraform.io/builtin/test"
-    }
-
     aws = {
       source  = "hashicorp/aws"
       version = "~> 4.33"

diff --git a/modules/onepassword-to-secret-manager/versions.tf b/modules/onepassword-to-secret-manager/versions.tf
@@ -0,0 +1,8 @@
+terraform {
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = "~> 4.33"
+    }
+  }
+}