Skip to content

Commit

Permalink
1.1.0 release. (#16)
Browse files Browse the repository at this point in the history
Release TIBCO Developer hub v1.1.0
  • Loading branch information
sagdeshp authored Mar 1, 2024
2 parents 57d41cb + 57d974c commit 24763b6
Show file tree
Hide file tree
Showing 54 changed files with 32,714 additions and 26,299 deletions.
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
playwright.config.ts
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 18
- run: yarn install
- name: validate config
run: yarn backstage-cli config:check --lax
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -139,3 +139,5 @@ environment.sh
*.environment.sh

.idea
# E2E test reports
e2e-test-report/
10 changes: 4 additions & 6 deletions build/platform/Dockerfile → Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Stage 1 - Create yarn install skeleton layer
FROM --platform=$BUILDPLATFORM node:16-bullseye-slim AS packages
FROM --platform=$BUILDPLATFORM node:18-bookworm-slim AS packages

WORKDIR /app
COPY package.json yarn.lock ./
Expand All @@ -12,7 +12,7 @@ COPY plugins plugins
RUN find packages \! -name "package.json" -mindepth 2 -maxdepth 2 -exec rm -rf {} \+

# Stage 2 - Install dependencies and build packages
FROM --platform=$BUILDPLATFORM node:16-bullseye-slim AS build
FROM --platform=$BUILDPLATFORM node:18-bookworm-slim AS build

RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
--mount=type=cache,target=/var/lib/apt,sharing=locked \
Expand Down Expand Up @@ -42,7 +42,7 @@ RUN mkdir packages/backend/dist/skeleton packages/backend/dist/bundle \
&& tar xzf packages/backend/dist/bundle.tar.gz -C packages/backend/dist/bundle

# Stage 3 - Build the actual backend image and install production dependencies
FROM --platform=$TARGETPLATFORM node:16-bullseye-slim
FROM --platform=$TARGETPLATFORM node:18-bookworm-slim

# Install sqlite3 dependencies. You can skip this if you don't use sqlite3 in the image,
# in which case you should also move better-sqlite3 to "devDependencies" in package.json.
Expand All @@ -59,7 +59,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
apt-get install -y --no-install-recommends python3 g++ build-essential python3-pip && \
yarn config set python /usr/bin/python3

RUN pip3 install mkdocs-techdocs-core==1.1.7
RUN pip3 install mkdocs-techdocs-core==1.1.7 --break-system-packages

# From here on we use the least-privileged `node` user to run the backend.
USER node
Expand All @@ -81,8 +81,6 @@ COPY --from=build --chown=node:node /app/packages/backend/dist/bundle/ ./
# Copy any other files that we need at runtime
COPY --chown=node:node app-config.yaml app-config.production.yaml ./

COPY --chown=node:node tibco-examples ./tibco-examples

# Copy license file
COPY --chown=node:node LICENSE.TXT /opt/tibco/license/

Expand Down
File renamed without changes.
12,393 changes: 6,978 additions & 5,415 deletions NOTICES

Large diffs are not rendered by default.

8 changes: 7 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,13 +87,19 @@ Start the frontend server
yarn start
```

### Steps to build

```sh
docker build -t <customImageName:customImageTag> .
```

## Helpful Documentation

[Docker configuration](./docker/README.md)\
[Docs](./docs/app-config-extensions.md)\
[Packages](./packages/README.md)\
[Plugins](./plugins/README.md)\
[Example Templates, Group and System](./tibco-examples/README.md)
[Example Templates, Group and System](https://github.com/TIBCOSoftware/tibco-developer-hub/tree/main/tibco-examples/README.md)

## Licenses

Expand Down
3 changes: 1 addition & 2 deletions app-config.template-local.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ catalog:
- type: file
target: ../../tibco-examples/tibco-examples.yaml
rules:
- allow: [Group, Template, System, Domain, Location]

- allow:[ Component, API, Location, Template, User, Group, Domain, System, Resource ]
auth:
# see https://backstage.io/docs/auth/ to learn about auth providers
environment: development
Expand Down
2 changes: 1 addition & 1 deletion backstage.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"version": "1.16.0"
"version": "1.21.1"
}
6 changes: 3 additions & 3 deletions build/platform/charts/tibco-developer-hub/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 1.0.32
version: 1.1.6

appVersion: "1.0.1"
appVersion: "1.1.0"

dependencies:
- name: common
Expand All @@ -19,4 +19,4 @@ dependencies:
- condition: postgresql.enabled
name: postgresql
repository: ""
version: 11.x.x
version: 11.x.x
14 changes: 14 additions & 0 deletions build/platform/charts/tibco-developer-hub/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,20 @@ Return the proper image name
{{- end -}}
{{- end -}}

{{- define "postgresql.initContainer.image" -}}
{{- $CPImageValues := dict "registry" "reldocker.tibco.com" -}}
{{- if .Values.global.cp -}}
{{- $CPImageValues = dict "registry" (.Values.global.cp.containerRegistry.url | default "reldocker.tibco.com") -}}
{{- $imageRoot := merge .Values.initContainer.image $CPImageValues -}}
{{ if (hasSuffix ".jfrog.io" $imageRoot.registry) }}
{{- $imageRoot = merge (dict "repository" .Values.initContainer.image.jfrogRepository) $imageRoot -}}
{{ include "common.images.image" (dict "imageRoot" $imageRoot "global" .Values.global) }}
{{- else -}}
{{ include "common.images.image" (dict "imageRoot" $imageRoot "global" .Values.global) }}
{{- end -}}
{{- end -}}
{{- end -}}

{{/*
Create the name of the service account to use
*/}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,13 @@ spec:
{{- end }}
{{- end }}
{{- end }}
{{- if .Values.backstage.initContainers }}
initContainers:
- name: check-db-ready
image: {{ include "postgresql.initContainer.image" . }}
command: ['sh', '-c',
'until pg_isready -U {{ .Values.postgresql.auth.username }} -h {{ include "backstage.postgresql.host" . }} -p 5432;
do echo waiting for database; sleep 2; done;']
{{- if .Values.backstage.initContainers }}
{{- include "common.tplvalues.render" ( dict "value" .Values.backstage.initContainers "context" $) | nindent 8 }}
{{- end }}
containers:
Expand Down
14 changes: 12 additions & 2 deletions build/platform/charts/tibco-developer-hub/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ backstage:
jfrogRepository: tibco-platform-local-docker/dx/tibco-hub

# -- Backstage image tag (immutable tags are recommended)
tag: "319"
tag: "381"

# -- Specify a imagePullPolicy.
# Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
Expand Down Expand Up @@ -403,4 +403,14 @@ autoscaling:

targetCPUUtilizationPercentage: 70

targetMemoryUtilizationPercentage: 70
targetMemoryUtilizationPercentage: 70

# Configuration needed for initContainer for deployment

initContainer:
image:
registry: ""
repository: pdx/postgresql
jfrogRepository: tibco-platform-local-docker/dx/postgresql
tag: 14.5.0-debian-11-r35
digest: ""
4 changes: 2 additions & 2 deletions build/platform/provision-samples/recipe.template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@
capabilityId: tibcohub
version:
- 1
- 0
- 1
- 0
recipe:
helmCharts:
- name: tibco-developer-hub
namespace: ${NAMESPACE}
version: 1.0.32
version: 1.1.6
repository:
chartMuseum:
host: ${HELM_REPO}
Expand Down
4 changes: 2 additions & 2 deletions build/platform/provision-samples/tibco-hub-cp-recipe.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"dependsOn": [
{
"capabilityId": "OAUTH2PROXY",
"version": [1, 0, 0]
"version": [1, 1, 0]
}
],
"provisioningRoles": ["DEV_OPS"],
Expand All @@ -29,7 +29,7 @@
"install": true
},
"name": "tibco-developer-hub",
"version": "1.0.32",
"version": "1.1.6",
"namespace": "${NAMESPACE}",
"repository": {
"chartMuseum": {
Expand Down
45 changes: 22 additions & 23 deletions config.d.ts
Original file line number Diff line number Diff line change
@@ -1,27 +1,5 @@
import { TaskScheduleDefinitionConfig } from '@backstage/backend-tasks';

interface WalkThrough {
/**
* Title for the Walk-through
* @visibility frontend
*/
title: string;
/**
* Array of tags for the Walk-through
* @visibility frontend
*/
tags: string[];
/**
* Description text for the Walk-through
* @visibility frontend
*/
text: string;
/**
* Hyperlink of external website for the Walk-through
* @visibility frontend
*/
link: string;
}
export interface Config {
app?: {
/**
Expand Down Expand Up @@ -75,7 +53,28 @@ export interface Config {
* Array of Walk-through which will be visible on the home page
* @visibility frontend
*/
items: WalkThrough[];
items: {
/**
* Title for the Walk-through
* @visibility frontend
*/
title: string;
/**
* Array of tags for the Walk-through
* @visibility frontend
*/
tags: string[];
/**
* Description text for the Walk-through
* @visibility frontend
*/
text: string;
/**
* Hyperlink of external website for the Walk-through
* @visibility frontend
*/
link: string;
}[];
};
/**
* Control plain link for the TIBCO® Developer Hub
Expand Down
Loading

0 comments on commit 24763b6

Please sign in to comment.