Merge pull request #181 from pymonger/main

Updates for deployment via Unity Marketplace

Author: mcduffie

common/aws.tf

@@ -2,7 +2,7 @@ locals {
   cost_tags = {
     ServiceArea = "аds"
     Proj = "${var.project}"
-    Venue = "${var.venue_prefix}${var.venue}"
+    Venue = "${var.deployment_name}-${var.venue}"
     Component = "${var.component_cost_name}"
     CreatedBy = "ads"
     Env = "${var.resource_prefix}"

common/variables.tf

@@ -9,7 +9,7 @@ variable "venue" {
   type        = string
 }
 
-variable "venue_prefix" {
+variable "deployment_name" {
   description = "Optional string to place before the venue name in resource names"
   type        = string
   default     = ""

dev_env/cognito/cognito_client.tf

@@ -3,7 +3,7 @@ data "aws_cognito_user_pools" "unity_user_pool" {
 }
 
 resource "aws_cognito_user_pool_client" "jupyter_cognito_client" {
-  name          = "${var.resource_prefix}-jupyter-${var.venue_prefix}${var.venue}-client"
+  name          = "${var.resource_prefix}-jupyter-${var.deployment_name}-${var.venue}-client"
   user_pool_id  = tolist(data.aws_cognito_user_pools.unity_user_pool.ids)[0]
 
   callback_urls = var.jupyter_base_url != null ? ["${var.jupyter_base_url}/${var.jupyter_base_path}/hub/oauth_callback"] : null

dev_env/jupyterhub/aws.tf

@@ -0,0 +1,17 @@
+locals {
+  cost_tags = {
+    ServiceArea = "аds"
+    Proj = "${var.project}"
+    Venue = "${var.deployment_name}-${var.venue}"
+    Component = "${var.component_cost_name}"
+    CreatedBy = "ads"
+    Env = "${var.resource_prefix}"
+    Stack = "${var.component_cost_name}"
+  }
+}
+
+provider "aws" {
+  default_tags {
+    tags = local.cost_tags
+  }
+}

dev_env/jupyterhub/aws.tf

@@ -0,0 +1,38 @@
+variable "project" {
+  description = "The name of the project matching the /unity/<{project>/<venue</project-name SSM parameter"
+  type        = string
+  default     = "unity"
+}
+
+variable "venue" {
+  description = "The name of the unity venue matching the /unity/<project>/<venue>/venue-name SSM parameter"
+  type        = string
+}
+
+variable "deployment_name" {
+  description = "Optional string to place before the venue name in resource names"
+  type        = string
+  default     = ""
+}
+
+variable "resource_prefix" {
+  description = "String used at the beginning of the names for all resources to identify them according to the UADS subsystem"
+  type        = string
+  default     = "uads"
+}
+
+variable "efs_identifier" {
+  description = "EFS file system to connect Jupyter shared storage with"
+  type        = string
+  # Example value:uads-development-efs-fs"
+}
+
+variable "installprefix" {
+  description = "Installation prefix"
+  type        = string
+  default     = ""
+}
+
+variable "tags" {
+  type = map(string)
+}

dev_env/jupyterhub/common_variables.tf

@@ -23,6 +23,11 @@ module "ebs_csi_irsa_role" {
     "eks_addon" = "ebs-csi"
     "terraform" = "true"
   }
+
+  depends_on = [
+    module.eks,
+    null_resource.eks_post_deployment_actions
+  ]
 }
 
 resource "aws_eks_addon" "ebs-csi" {
@@ -36,7 +41,11 @@ resource "aws_eks_addon" "ebs-csi" {
     "terraform" = "true"
   }
 
-  depends_on = [ module.eks ]
+  depends_on = [
+    module.eks,
+    module.ebs_csi_irsa_role,
+    null_resource.eks_post_deployment_actions
+  ]
 }
 
 ################
@@ -65,6 +74,11 @@ module "efs_csi_irsa_role" {
     "eks_addon" = "efs-csi"
     "terraform" = "true"
   }
+
+  depends_on = [
+    module.eks,
+    null_resource.eks_post_deployment_actions
+  ]
 }
 
 resource "aws_eks_addon" "efs-csi" {
@@ -76,5 +90,9 @@ resource "aws_eks_addon" "efs-csi" {
     "terraform" = "true"
   }
 
-  depends_on = [ module.eks ]
+  depends_on = [
+    module.eks,
+    module.efs_csi_irsa_role,
+    null_resource.eks_post_deployment_actions
+  ]
 }