Merge branch 'master' of github.com:backstage/backstage into adamdmharvey/cicd-mkdocs

.github/CODEOWNERS

@@ -56,6 +56,7 @@ yarn.lock                                           @backstage/maintainers @back
 /plugins/gcalendar                                  @backstage/maintainers @szubster @ptychu @kielosz @alexrybch
 /plugins/git-release-manager                        @backstage/maintainers @erikengervall
 /plugins/home                                       @backstage/discoverability-maintainers
+/plugins/home-*                                     @backstage/discoverability-maintainers
 /plugins/ilert                                      @backstage/maintainers @yacut
 /plugins/jenkins                                    @backstage/maintainers @timja
 /plugins/jenkins-backend                            @backstage/maintainers @timja

.github/uffizzi/docker-compose.uffizzi.yml

@@ -14,6 +14,7 @@ services:
       POSTGRES_PORT: 5432
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: kiTMoTsiEuyQ43GrL4Hv
+      REF_NAME: ${GITHUB_SHA}
       NODE_ENV: production
     deploy:
       resources:

.github/uffizzi/uffizzi.production.app-config.yaml

@@ -28,6 +28,7 @@ backend:
     credentials: true
   csp:
     connect-src: ["'self'", 'http:', 'https:']
+    img-src: ["'self'", 'data:', 'https://cdnjs.cloudflare.com']
     # Content-Security-Policy directives follow the Helmet format: https://helmetjs.github.io/#reference
     # Default Helmet Content-Security-Policy values can be removed by setting the key to false
 
@@ -41,15 +42,18 @@ auth:
 catalog:
   locations:
     - type: url
-      target: https://github.com/backstage/backstage/blob/master/packages/catalog-model/examples/all.yaml
+      target: https://github.com/backstage/backstage/blob/${REF_NAME}/packages/catalog-model/examples/all.yaml
 
     - type: url
-      target: https://github.com/backstage/backstage/blob/master/packages/catalog-model/examples/acme-corp.yaml
+      target: https://github.com/backstage/backstage/blob/${REF_NAME}/plugins/techdocs-backend/examples/documented-component-uffizzi/catalog-info.yaml
+
+    - type: url
+      target: https://github.com/backstage/backstage/blob/${REF_NAME}/packages/catalog-model/examples/acme-corp.yaml
       rules:
         - allow: [User, Group]
 
     - type: url
-      target: https://github.com/backstage/backstage/blob/master/plugins/scaffolder-backend/sample-templates/all-templates.yaml
+      target: https://github.com/backstage/backstage/blob/${REF_NAME}/plugins/scaffolder-backend/sample-templates/all-templates.yaml
       rules:
         - allow: [Template]
 
@@ -124,7 +128,7 @@ proxy:
 techdocs:
   builder: 'local' # Alternatives - 'external'
   generator:
-    runIn: 'docker'
+    runIn: 'local'
     # dockerImage: my-org/techdocs # use a custom docker image
     # pullImage: true # or false to disable automatic pulling of image (e.g. if custom docker login is required)
   publisher:

.github/vale/Vocab/Backstage/accept.txt

@@ -188,6 +188,7 @@ learnings
 Leasot
 lerna
 Lerna
+lightbox
 limitranges
 LocalStack
 lockdown
@@ -247,6 +248,7 @@ Olausson
 Oldsberg
 onboarding
 Onboarding
+OpenSearch
 OpenShift
 orgs
 padding
@@ -314,6 +316,7 @@ scaffolded
 scaffolder
 Scaffolder
 scrollbar
+sdks
 seb
 semlas
 semver
@@ -341,6 +344,8 @@ stdout
 storable
 stringified
 stringify
+subcommand
+subcommands
 subcomponent
 subcomponents
 subfolder
@@ -389,6 +394,7 @@ transpilers
 truthy
 TSDoc
 typeahead
+Uffizzi
 ui
 unbreak
 Unconference

.github/workflows/ci.yml

@@ -96,7 +96,7 @@ jobs:
         run: node scripts/verify-api-reference.js
 
       - name: verify openapi yaml file matches generated ts file
-        run: yarn backstage-repo-tools schema:openapi:verify
+        run: yarn backstage-repo-tools schema openapi verify
 
       - name: verify doc links
         run: node scripts/verify-links.js

.github/workflows/uffizzi-build.yml

@@ -81,7 +81,7 @@ jobs:
           BACKSTAGE_IMAGE=$(echo ${{ needs.build-backstage.outputs.tags }})
           export BACKSTAGE_IMAGE
           # Render simple template from environment variables.
-          envsubst '$BACKSTAGE_IMAGE' < .github/uffizzi/docker-compose.uffizzi.yml > docker-compose.rendered.yml
+          envsubst '$BACKSTAGE_IMAGE $GITHUB_SHA' < .github/uffizzi/docker-compose.uffizzi.yml > docker-compose.rendered.yml
           cat docker-compose.rendered.yml
       - name: Upload Rendered Compose File as Artifact
         uses: actions/upload-artifact@v3

.github/workflows/verify_e2e-kubernetes.yml

@@ -35,7 +35,7 @@ jobs:
           cache-prefix: ${{ runner.os }}-v${{ matrix.node-version }}
 
       - name: bootstrap kind
-        uses: helm/kind-action@v1.5.0
+        uses: helm/kind-action@v1.7.0
 
       - name: kubernetes test
         working-directory: packages/backend-common