updated

Azure · Feb 28, 2024 · 79b248f · 79b248f
1 parent 33db14a
commit 79b248f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 219 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -350,11 +350,11 @@ jobs:
           azcliversion: ${{ env.AZCLIVERSION }}
           inlineScript: |
             DEPNAME='Dep${{ github.run_number }}'
-            PARAMS="location=$REGION applicationClientId=${{ secrets.STAMP_CLIENT_ID }}"
-            az deployment group create -f bicep/main.bicep -g $RESOURCE_GROUP -p ${{ env.ParamFilePath }} -p $PARAMS --name $DEPNAME --verbose
+            PARAMS="location=$REGION applicationClientId=${{ secrets.STAMP_CLIENT_ID }} applicationClientSecret=${{ secrets.STAMP_CLIENT_SECRET }} applicationClientPrincipalOid=${{ secrets.STAMP_CLIENT_OID }}"
+            az stack group create -f bicep/main.bicep -g $RESOURCE_GROUP -p ${{ env.ParamFilePath }} -p $PARAMS --name $DEPNAME --verbose
             az deployment operation group list --resource-group $RESOURCE_GROUP --name $DEPNAME
 
-            AKS_NAME=$(az deployment group show -n $DEPNAME -g $RESOURCE_GROUP --query "properties.outputs.aksName.value" -o tsv)
+            AKS_NAME=$(az stack group show -n $DEPNAME -g $RESOURCE_GROUP --query "properties.outputs.aksName.value" -o tsv)
             echo "AKS_NAME=$AKS_NAME" >> $GITHUB_OUTPUT
 
   Verify:

diff --git a/software/applications/osdu-azure/osdu-services.yaml b/software/applications/osdu-azure/osdu-services.yaml
@@ -97,219 +97,3 @@ spec:
         secret:
           name: azure-resources
           key: keyvault-uri
-########################################
-############  ENTITLEMENTS  ############
-    - service: entitlements
-      repository: community.opengroup.org:5555/osdu/platform/security-and-compliance/entitlements/entitlements-azure-m18-master
-      tag: latest
-      path: /api/entitlements/v2/*
-      probe:
-        path: /api/entitlements/v2/_ah/readiness_check
-        port: http
-      keyvault: true
-      auth:
-        disable:
-          - "/"
-          - "*/index.html"
-          - "*/v2/api-docs"
-          - "*/swagger-resources"
-          - "*/swagger-ui.html"
-          - "*/actuator/health"
-          - "*/health"
-          - "*/configuration/ui"
-          - "*/configuration/security"
-          - "/api/entitlements/v2/info"
-          - "/api/entitlements/v2/swagger-resources/*"
-          - "/api/entitlements/v2/webjars/*"
-      env:
-      - name: spring_application_name
-        value: "entitlements"
-      - name: server.servlet.contextPath
-        value: "/api/entitlements/v2/"
-      - name: LOGGING_LEVEL
-        value: "INFO"
-      - name: server_port
-        value: "80"
-      - name: service_domain_name
-        value: "contoso.com"
-      - name: root_data_group_quota
-        value: "5000"
-      - name: redis_ttl_seconds
-        value: "1"
-      - name: partition_service_endpoint
-        value: "http://partition/api/partition/v1"
-      - name: azure_istioauth_enabled
-        value: "true"
-      - name: azure_activedirectory_AppIdUri
-        value: "api://"
-      - name: azure_paas_podIdentity_isEnabled
-        value: "false"
-      - name: azure_msi_client_id
-        secret:
-          name: active-directory
-          key: msi-clientid
-      - name: AZURE_TENANT_ID
-        secret:
-          name: active-directory
-          key: tenant-id
-      - name: AZURE_CLIENT_ID
-        secret:
-          name: active-directory
-          key: principal-clientid
-      - name: AZURE_CLIENT_SECRET
-        secret:
-          name: active-directory
-          key: principal-clientpassword
-      - name: KEYVAULT_URI
-        secret:
-          name: azure-resources
-          key: keyvault-uri
-########################################
-###############  LEGAL  ################
-    - service: legal
-      repository: community.opengroup.org:5555/osdu/platform/security-and-compliance/legal/legal-azure-m18-master
-      tag: latest
-      path: /api/legal/v1/*
-      probe:
-        path: /actuator/health
-        port: 8081
-        liveness:
-          delay: 250
-          seconds: 10
-      keyvault: true
-      auth:
-        disable:
-          - "/"
-          - "*/index.html"
-          - "*/v2/api-docs"
-          - "*/swagger-resources"
-          - "*/swagger-ui.html"
-          - "*/configuration/ui"
-          - "*/configuration/security"
-          - "/api/legal/v1/swagger-resources/*"
-          - "/api/legal/v1/webjars/*"
-          - "*/actuator/health"
-          - "*/health"
-      env:
-      - name: spring_application_name
-        value: "legal"
-      - name: server.servlet.contextPath
-        value: "/api/legal/v1/"
-      - name: server_port
-        value: "80"
-      - name: ACCEPT_HTTP
-        value: "true"
-      - name: cosmosdb_database
-        value: "osdu-db"
-      - name: LOG_PREFIX
-        value: "legal"
-      - name: azure_storage_container_name
-        value: "legal-service-azure-configuration"
-      - name: azure_storage_enable_https
-        value: "true"
-      - name: legal_service_region
-        value: "us"
-      - name: servicebus_topic_name
-        value: "legaltags"
-      - name: entitlements_service_endpoint
-        value: "http://entitlements/api/entitlements/v2"
-      - name: entitlements_service_api_key
-        value: "OBSOLETE"
-      - name: partition_service_endpoint
-        value: "http://partition/api/partition/v1"
-      - name: azure_istioauth_enabled
-        value: "true"
-      - name: SPRING_CONFIG_NAME
-        value: "common,application"
-      - name: azure_paas_podIdentity_isEnabled
-        value: "true"
-      - name: REDIS_DATABASE
-        value: "2"
-      - name: aad_client_id
-        value: "api://"
-      - name: AZURE_TENANT_ID
-        secret:
-          name: active-directory
-          key: tenant-id
-      - name: AZURE_CLIENT_ID
-        secret:
-          name: active-directory
-          key: principal-clientid
-      - name: AZURE_CLIENT_SECRET
-        secret:
-          name: active-directory
-          key: principal-clientpassword
-      - name: KEYVAULT_URI
-        secret:
-          name: azure-resources
-          key: keyvault-uri
-########################################
-###############  SCHEMA  ###############
-    - service: schema
-      repository: community.opengroup.org:5555/osdu/platform/system/schema-service/schema-service-azure-m18-master
-      tag: latest
-      path: /api/schema-service/v1/*
-      probe:
-        path: /api/schema-service/v1/swagger-ui.html
-        port: http
-      keyvault: true
-      auth:
-        disable:
-          - "/"
-          - "*/index.html"
-          - "*/v2/api-docs"
-          - "*/swagger-resources"
-          - "*/swagger-ui.html"
-          - "*/configuration/ui"
-          - "*/configuration/security"
-          - "/api/schema-service/v1/swagger-resources/*"
-          - "/api/schema-service/v1/webjars/*"
-          - "*/actuator/health"
-          - "*/health"
-      env:
-      - name: spring_application_name
-        value: "schema"
-      - name: server.servlet.contextPath
-        value: "/api/schema-service/v1/"
-      - name: server_port
-        value: "80"
-      - name: ACCEPT_HTTP
-        value: "true"
-      - name: cosmosdb_database
-        value: "osdu-db"
-      - name: LOG_PREFIX
-        value: "schema"
-      - name: entitlements_service_endpoint
-        value: "http://entitlements/api/entitlements/v2"
-      - name: entitlements_service_api_key
-        value: "OBSOLETE"
-      - name: partition_service_endpoint
-        value: "http://partition/api/partition/v1"
-      - name: shared_partition
-        value: "${{ env.PARTITION_NAME }}"
-      - name: azure_istioauth_enabled
-        value: "true"
-      - name: event_grid_enabled
-        value: "false"
-      - name: event_grid_topic
-        value: "schemachangedtopic"
-      - name: azure_paas_podIdentity_isEnabled
-        value: "false"
-      - name: aad_client_id
-        value: "api://"
-      - name: AZURE_TENANT_ID
-        secret:
-          name: active-directory
-          key: tenant-id
-      - name: AZURE_CLIENT_ID
-        secret:
-          name: active-directory
-          key: principal-clientid
-      - name: AZURE_CLIENT_SECRET
-        secret:
-          name: active-directory
-          key: principal-clientpassword
-      - name: KEYVAULT_URI
-        secret:
-          name: azure-resources
-          key: keyvault-uri