Fix issues uncovered when going through a fresh install.

Author: mcduffie

common/variables.tf

@@ -1,33 +1,32 @@
 variable "unity_instance" {
-  # This should match the VPC name
-  # Example Value: "Unity-Dev"
-  description = "Name of the Unity instance where deploying"
+  description = "Name of the Unity instance where deploying, must match the VPC name"
   type        = string
+  # Example Value: "Unity-Dev"
 }
 
 variable "tenant_identifier" {
-  # String inserted into many different resource names
-  # Example Value: "development"
-  description = "String identifying the tenant for which resources are created"
-  type        = string
-}
-
-variable "resource_prefix" {
-  description = "String used at the beginning of the names for all resources to identify them according to the UADS subsystem"
+  description = "String identifying the tenant for which resources are created, string inserted into generated resource names"
   type        = string
-  default     = "uads"
+  # Example Value: "development"
 }
 
 variable "s3_identifier" {
   description = "String used in S3 bucket names to differentiate them between deployment venues"
   type        = string
-  default     = "dev"
+  # Example value: "dev"
 }
 
 variable "efs_identifier" {
   description = "EFS file system to connect Jupyter shared storage with"
   type        = string
   default     = "uads-development-efs-fs"
+  # Example value:uads-development-efs-fs"
+}
+
+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 "availability_zone_1" {

dev_env/cognito/jupyter_uri_env.sh

@@ -10,8 +10,8 @@ if [ -z "$(which terraform 2>/dev/null)" ]; then
     exit 1
 fi
 
-cd $(realpath $script_dir/..)/jupyterlab
+cd $(realpath $script_dir/..)/jupyterhub
 
 jupyter_uri=$(terraform output -raw jupyter_base_uri)
 
-echo "export TF_VAR_jupyter_base_uri=\"${jupyter_uri}\""
+echo "export TF_VAR_jupyter_base_url=\"${jupyter_uri}\""

dev_env/jupyterhub/eks_cluster.tf

@@ -51,3 +51,7 @@ resource "aws_autoscaling_attachment" "autoscaling_attachment" {
   autoscaling_group_name = lookup(lookup(lookup(aws_eks_node_group.jupyter_cluster_node_group, "resources")[0], "autoscaling_groups")[0], "name")
   lb_target_group_arn   = aws_lb_target_group.jupyter_alb_target_group.arn
 }
+
+output "eks_cluster_name" {
+  value = aws_eks_cluster.jupyter_cluster.name
+}

dev_env/shared_storage/efs.tf

@@ -6,3 +6,10 @@ resource "aws_efs_file_system" "dev_support_efs" {
      Name = "${var.efs_identifier}"
    }
 }
+
+resource "aws_efs_access_point" "jupyter_shared" {
+  file_system_id = aws_efs_file_system.dev_support_efs.id
+  root_directory {
+    path = "/shared"
+  }
+}