fix: changed oci provider namespace in submodules (#508)

hyder · web-flow · commit 4ef0c724d498 · 2022-04-07T16:54:27.000+10:00
* fix: changed oci provider namespace in submodules

Signed-off-by: Ali Mukadam &lt;ali.mukadam@oracle.com&gt;
diff --git a/.gitignore b/.gitignore
@@ -15,3 +15,4 @@ generated/**
 # visual code
  **/.vscode/*
 
+.terraform.lock.hcl
diff --git a/main.tf b/main.tf
@@ -36,7 +36,7 @@ module "vcn" {
 
 module "bastion" {
   source  = "oracle-terraform-modules/bastion/oci"
-  version = "3.0.0"
+  version = "3.1.0"
 
   tenancy_id     = var.tenancy_id
   compartment_id = var.compartment_id
@@ -84,7 +84,7 @@ module "bastion" {
 
 module "operator" {
   source  = "oracle-terraform-modules/operator/oci"
-  version = "3.0.3"
+  version = "3.1.0"
 
   tenancy_id = var.tenancy_id
 
diff --git a/modules/bastionsvc/versions.tf b/modules/bastionsvc/versions.tf
@@ -0,0 +1,10 @@
+terraform {
+  required_providers {
+    oci = {
+      source = "oracle/oci"
+      # pass oci home region provider explicitly for identity operations
+      version               = ">= 4.67.3"
+    }
+  }
+  required_version = ">= 1.0.0"
+}
diff --git a/modules/extensions/iam.tf b/modules/extensions/iam.tf
@@ -4,9 +4,10 @@
 terraform {
   required_providers {
     oci = {
-      source = "hashicorp/oci"
+      source = "oracle/oci"
       # pass oci home region provider explicitly for identity operations
       configuration_aliases = [oci.home]
+      version               = ">= 4.67.3"
     }
   }
   required_version = ">= 1.0.0"
diff --git a/modules/network/variables.tf b/modules/network/variables.tf
@@ -73,8 +73,4 @@ variable "public_lb_allowed_ports" {
 
 variable "create_fss" {
   type = bool
-}
-
-variable "create_fss" {
-  type = bool
-}
+}
diff --git a/modules/network/versions.tf b/modules/network/versions.tf
@@ -0,0 +1,10 @@
+terraform {
+  required_providers {
+    oci = {
+      source = "oracle/oci"
+      # pass oci home region provider explicitly for identity operations
+      version               = ">= 4.67.3"
+    }
+  }
+  required_version = ">= 1.0.0"
+}
diff --git a/modules/oke/iam.tf b/modules/oke/iam.tf
@@ -4,9 +4,10 @@
 terraform {
   required_providers {
     oci = {
-      source = "hashicorp/oci"
+      source = "oracle/oci"
       # pass oci home region provider explicitly for identity operations
       configuration_aliases = [oci.home]
+      version               = ">= 4.67.3"
     }
   }
   required_version = ">= 1.0.0"
diff --git a/modules/storage/fss.tf b/modules/storage/fss.tf
@@ -1,17 +1,6 @@
 # Copyright 2017, 2021 Oracle Corporation and/or affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl
 
-terraform {
-  required_providers {
-    oci = {
-      source = "hashicorp/oci"
-      # pass oci home region provider explicitly for identity operations
-      configuration_aliases = [oci.home]
-    }
-  }
-  required_version = ">= 1.0.0"
-}
-
 # Create file system
 resource "oci_file_storage_file_system" "fss" {
   availability_domain = local.availability_domain
diff --git a/modules/storage/versions.tf b/modules/storage/versions.tf
@@ -0,0 +1,11 @@
+terraform {
+  required_providers {
+    oci = {
+      source = "oracle/oci"
+      # pass oci home region provider explicitly for identity operations
+      configuration_aliases = [oci.home]
+      version               = ">= 4.67.3"
+    }
+  }
+  required_version = ">= 1.0.0"
+}
diff --git a/versions.tf b/versions.tf
@@ -4,9 +4,9 @@
 terraform {
   required_providers {
     oci = {
-      source = "oracle/oci"
-      version = ">= 4.67.3"
+      source                = "oracle/oci"
       configuration_aliases = [oci.home]
+      version               = ">= 4.67.3"
     }
   }
   required_version = ">= 1.0.0"

Original file line number	Diff line number	Diff line change
`@@ -15,3 +15,4 @@ generated/**`
`15`	`15`	`# visual code`
`16`	`16`	`*/.vscode/`
`17`	`17`
	`18`	`+.terraform.lock.hcl`
Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,10 @@`
`4`	`4`	`terraform {`
`5`	`5`	`required_providers {`
`6`	`6`	`oci = {`
`7`		`- source = "hashicorp/oci"`
	`7`	`+ source = "oracle/oci"`
`8`	`8`	`# pass oci home region provider explicitly for identity operations`
`9`	`9`	`configuration_aliases = [oci.home]`
	`10`	`+ version = ">= 4.67.3"`
`10`	`11`	`}`
`11`	`12`	`}`
`12`	`13`	`required_version = ">= 1.0.0"`
Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,9 @@`
`4`	`4`	`terraform {`
`5`	`5`	`required_providers {`
`6`	`6`	`oci = {`
`7`		`- source = "oracle/oci"`
`8`		`- version = ">= 4.67.3"`
	`7`	`+ source = "oracle/oci"`
`9`	`8`	`configuration_aliases = [oci.home]`
	`9`	`+ version = ">= 4.67.3"`
`10`	`10`	`}`
`11`	`11`	`}`
`12`	`12`	`required_version = ">= 1.0.0"`