Added resource_group & region to database datasource

Author: umarali-nagoor

examples/service-credentials/README.md

@@ -23,6 +23,9 @@ module "db-service-credentials" {
 | Name                 | Description                                       | Type     | Default | Required |
 |----------------------|---------------------------------------------------|----------|---------|----------|
 | db_name              | Existing db Name.                                 | string   | n/a     | yes      |
+| ibm_region           | Provider level region.                            | string   | n/a     | no       |
+| resource_group       | Name of the resource group                        | string   | n/a     | no       |
+| location             | Location to which DB instance belongs to          | string   | n/a     | no       |
 | key_name             | Name of key to be created.                        | string   | n/a     | yes      |
 | key_role             | Name of the user role                             | string   | n/a     | yes      |
 

examples/service-credentials/main.tf

@@ -4,12 +4,18 @@
 ###########################################################
 
 provider "ibm" {
+  region = var.ibm_region
+}
 
+data "ibm_resource_group" "resource_group" {
+  name = var.resource_group != null ? var.resource_group : "default"
 }
 
 module "db-service-credentials" {
-  source   = "../../modules/service-credentials"
-  db_name  = var.db_name
-  key_name = var.key_name
-  key_role = var.key_role
+  source            = "../../modules/service-credentials"
+  db_name           = var.db_name
+  location          = var.location
+  resource_group_id = data.ibm_resource_group.resource_group.id
+  key_name          = var.key_name
+  key_role          = var.key_role
 }

examples/service-credentials/variables.tf

@@ -3,14 +3,31 @@
 # Copyright 2021 IBM
 ###########################################################
 
-
 variable "db_name" {
   type        = string
   description = "Name of an existing Database"
 }
+
+variable "ibm_region" {
+  type        = string
+  description = "IBM Provider level region"
+  default     = "us-south"
+}
+variable "resource_group" {
+  type        = string
+  description = "Name of the resource group, DB instance belongs to"
+  default     = null
+}
+
+variable "location" {
+  type        = string
+  description = "Location in which DB instance exists"
+  default     = null
+}
+
 variable "key_name" {
   type        = string
-  description = "Nam eof the Key instance to be created"
+  description = "Name of the Key instance to be created"
 }
 variable "key_role" {
   type        = string

modules/service-credentials/README.md

@@ -23,6 +23,8 @@ module "db-service-credentials" {
 | Name                 | Description                                       | Type     | Default | Required |
 |----------------------|---------------------------------------------------|----------|---------|----------|
 | db_name              | Existing db Name.                                 | string   | n/a     | yes      |
+| resource_group_id    | ID of the resource group                          | string   | n/a     | no       |
+| location             | Location to which DB instance belongs to          | string   | n/a     | no       |
 | key_name             | Name of key to be created.                        | string   | n/a     | yes      |
 | key_role             | name of the user role                             | string   | n/a     | yes      |
 

modules/service-credentials/main.tf

@@ -2,9 +2,10 @@
 # Create service credentials to existing DB instance
 # Copyright 2021 IBM
 ###########################################################
-
 data "ibm_database" "db" {
-  name = var.db_name
+  name              = var.db_name
+  location          = var.location != null ? var.location : null
+  resource_group_id = var.resource_group_id != null ? var.resource_group_id : null
 }
 
 resource "ibm_resource_key" "dbKey" {

modules/service-credentials/variables.tf

@@ -8,11 +8,25 @@ variable "db_name" {
   type        = string
   description = "Name of an existing Database"
 }
+
+variable "resource_group_id" {
+  type        = string
+  description = "ID of the resource group, DB instance belongs to"
+  default     = null
+}
+
+variable "location" {
+  type        = string
+  description = "Location in which DB instance exists"
+  default     = null
+}
+
 variable "key_name" {
   type        = string
   description = "Nam eof the Key instance to be created"
 }
 variable "key_role" {
   type        = string
   description = "Name of a user role. Valid roles are Writer, Reader, Manager, Administrator, Operator, Viewer, and Editor."
+  default     = "Viewer"
 }