Fix a couple bugs

Dockerfile

@@ -23,7 +23,7 @@ EXPOSE 5050
 ENV GIT_HASH $GIT_HASH
 ENV HELM_DEBUG 1
 # WARNING: If you are changing any versions here, update it in the reference.conf
-ENV TERRA_APP_SETUP_VERSION 0.0.3
+ENV TERRA_APP_SETUP_VERSION 0.0.4
 ENV TERRA_APP_VERSION 0.5.0
 # This is galaxykubeman, which references Galaxy
 ENV GALAXY_VERSION 1.6.1
@@ -55,7 +55,6 @@ RUN helm repo add ingress-nginx https://kubernetes.github.io/ingress-nginx && \
 # pulling `terra-app-setup` locally and add cert files to the chart.
 # Leonardo will install the chart from local version.
 # We are also caching charts so they are not downloaded with every helm-install
-
 RUN cd /leonardo && \
     helm pull terra-app-setup-charts/terra-app-setup --version $TERRA_APP_SETUP_VERSION --untar && \
     helm pull galaxy/galaxykubeman --version $GALAXY_VERSION --untar && \

http/src/main/resources/reference.conf

@@ -939,7 +939,7 @@ terra-app-setup-chart {
   # cert files into the local chart.
   chart-name = "/leonardo/terra-app-setup"
   # If you change this here, be sure to update it in the dockerfile
-  chart-version = "0.0.3"
+  chart-version = "0.0.4"
 }
 
 app-service {

http/src/main/scala/org/broadinstitute/dsde/workbench/leonardo/http/service/AppServiceInterp.scala

@@ -723,7 +723,7 @@ final class LeoAppServiceInterp[F[_]: Parallel](config: AppServiceConfig,
       // Step 2: call LZ for LZ resources
       lzResourcesByPurpose <- wsmDao.listLandingZoneResourcesByType(landingZoneId, userToken)
       groupedLzResources = lzResourcesByPurpose.foldMap(a =>
-        a.deployedResources.groupBy(b => (a.purpose, b.resourceType))
+        a.deployedResources.groupBy(b => (a.purpose, b.resourceType.toLowerCase))
       )
 
       aksClusterName <- getLandingZoneResourceName(groupedLzResources,
@@ -791,7 +791,7 @@ final class LeoAppServiceInterp[F[_]: Parallel](config: AppServiceConfig,
     useParent: Boolean
   ): F[String] =
     landingZoneResourcesByPurpose
-      .get((purpose, resourceType))
+      .get((purpose, resourceType.toLowerCase))
       .flatMap(_.headOption)
       .flatMap { r =>
         if (useParent) r.resourceParentId.flatMap(_.split('/').lastOption)

http/src/main/scala/org/broadinstitute/dsde/workbench/leonardo/util/AKSInterpreter.scala

@@ -275,6 +275,7 @@ class AKSInterpreter[F[_]](config: AKSInterpreterConfig,
         raw"cloud=azure",
         // KSA configs
         raw"serviceAccount.name=${ksaName.value}",
+
         // relay configs
         raw"relaylistener.connectionString=Endpoint=sb://${relayNamespace.value}.servicebus.windows.net/;SharedAccessKeyName=listener;SharedAccessKey=${relayPrimaryKey.value};EntityPath=${relayHcName.value}",
         raw"relaylistener.connectionName=${relayHcName.value}",
@@ -283,7 +284,10 @@ class AKSInterpreter[F[_]](config: AKSInterpreterConfig,
         raw"relaylistener.samUrl=${config.samConfig.server}",
         raw"relaylistener.samResourceId=${samResourceId.resourceId}",
         raw"relaylistener.samResourceType=kubernetes-app",
-        raw"relaylistener.samAction=connect"
+        raw"relaylistener.samAction=connect",
+
+        // general configs
+        raw"fullnameOverride=setup-${release.asString}"
       ).mkString(",")
     )