Merge pull request #7 from mouhsen-ibrahim/mi-add-environment

Make sure that humanitec environment is created

Author: jayonthenet

1_demo.sh

@@ -4,10 +4,11 @@ set -eo pipefail
 echo "Deploying workload"
 
 humanitec_app=$(terraform -chdir=setup/terraform output -raw humanitec_app)
+humanitec_environment=$(terraform -chdir=setup/terraform output -raw humanitec_environment)
 
-humctl score deploy --app "$humanitec_app" --env development -f ./score.yaml --wait
+humctl score deploy --app "$humanitec_app" --env "$humanitec_environment" -f ./score.yaml --wait
 
-workload_host=$(humctl get active-resources --app "$humanitec_app" --env development -o yaml | yq '.[] | select(.metadata.type == "route") | .status.resource.host')
+workload_host=$(humctl get active-resources --app "$humanitec_app" --env "$humanitec_environment" -o yaml | yq '.[] | select(.metadata.type == "route") | .status.resource.host')
 
 echo "Waiting for workload to be available"
 
@@ -19,6 +20,6 @@ if curl -I --retry 30 --retry-delay 3 --retry-all-errors --fail \
 else
   echo "Workload not available"
   kubectl get pods --all-namespaces
-  kubectl -n "$humanitec_app-development" logs deployment/hello-world
+  kubectl -n "$humanitec_app-$humanitec_environment" logs deployment/hello-world
   exit 1
 fi

setup/terraform/idp-base.tf

@@ -8,15 +8,23 @@ resource "random_string" "install_id" {
 }
 
 locals {
-  app    = "5min-idp-${random_string.install_id.result}"
-  prefix = "${local.app}-"
+  app         = "5min-idp-${random_string.install_id.result}"
+  prefix      = "${local.app}-"
+  environment = "development-${random_string.install_id.result}"
 }
 
 resource "humanitec_application" "demo" {
   id   = local.app
   name = local.app
 }
 
+resource "humanitec_environment" "demo" {
+  app_id = humanitec_application.demo.id
+  id     = local.environment
+  name   = "A demo environment for 5min-idp"
+  type   = "development"
+}
+
 # Configure k8s namespace naming
 
 resource "humanitec_resource_definition" "k8s_namespace" {

setup/terraform/outputs.tf

@@ -2,3 +2,8 @@ output "humanitec_app" {
   description = "The ID of the Humanitec application"
   value       = humanitec_application.demo.id
 }
+
+output "humanitec_environment" {
+  description = "The ID of the Humanitec environment"
+  value       = humanitec_environment.demo.id
+}