From 4ef0c724d49892144c682c302503d5b3ea310043 Mon Sep 17 00:00:00 2001
From: Ali Mukadam <ali.mukadam@oracle.com>
Date: Thu, 7 Apr 2022 16:54:27 +1000
Subject: [PATCH] fix: changed oci provider namespace in submodules (#508)

* fix: changed oci provider namespace in submodules

Signed-off-by: Ali Mukadam <ali.mukadam@oracle.com>
---
 .gitignore                     |  1 +
 main.tf                        |  4 ++--
 modules/bastionsvc/versions.tf | 10 ++++++++++
 modules/extensions/iam.tf      |  3 ++-
 modules/network/variables.tf   |  6 +-----
 modules/network/versions.tf    | 10 ++++++++++
 modules/oke/iam.tf             |  3 ++-
 modules/storage/fss.tf         | 11 -----------
 modules/storage/versions.tf    | 11 +++++++++++
 versions.tf                    |  4 ++--
 10 files changed, 41 insertions(+), 22 deletions(-)
 create mode 100644 modules/bastionsvc/versions.tf
 create mode 100644 modules/network/versions.tf
 create mode 100644 modules/storage/versions.tf

diff --git a/.gitignore b/.gitignore
index 7b3c7b92..e024ad1d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ generated/**
 # visual code
  **/.vscode/*
 
+.terraform.lock.hcl
\ No newline at end of file
diff --git a/main.tf b/main.tf
index d8cdcaa2..d69e15ab 100644
--- 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
new file mode 100644
index 00000000..e6dc0bd7
--- /dev/null
+++ 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"
+}
\ No newline at end of file
diff --git a/modules/extensions/iam.tf b/modules/extensions/iam.tf
index 344780e0..1521dc79 100644
--- 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
index 721d57c2..d1272cea 100644
--- 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
-}
+}
\ No newline at end of file
diff --git a/modules/network/versions.tf b/modules/network/versions.tf
new file mode 100644
index 00000000..e6dc0bd7
--- /dev/null
+++ 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"
+}
\ No newline at end of file
diff --git a/modules/oke/iam.tf b/modules/oke/iam.tf
index 2b977da4..14c25040 100644
--- 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
index 9e195697..db0abeed 100644
--- 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
new file mode 100644
index 00000000..9b11f3ec
--- /dev/null
+++ 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"
+}
\ No newline at end of file
diff --git a/versions.tf b/versions.tf
index e2691624..e1c766ab 100644
--- 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"