Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update analytics-provider-segment wrapper #1945

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ibm/pipelines/value_files/values_showcase-rbac.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ global:
disabled: true
- package: ./dynamic-plugins/dist/backstage-community-plugin-rbac
disabled: false
- package: ./dynamic-plugins/dist/janus-idp-backstage-plugin-analytics-provider-segment
- package: ./dynamic-plugins/dist/backstage-community-plugin-analytics-provider-segment
disabled: true

# -- Upstream Backstage [chart configuration](https://github.com/backstage/charts/blob/main/charts/backstage/values.yaml)
Expand Down
2 changes: 1 addition & 1 deletion .rhdh/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/parfuemerie-douglas-scaffo
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/pagerduty-backstage-plugin/package.json ./dynamic-plugins/wrappers/pagerduty-backstage-plugin/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/pagerduty-backstage-plugin-backend-dynamic/package.json ./dynamic-plugins/wrappers/pagerduty-backstage-plugin-backend-dynamic/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/pagerduty-backstage-plugin-backend-dynamic/dist-dynamic/package.json ./dynamic-plugins/wrappers/pagerduty-backstage-plugin-backend-dynamic/dist-dynamic/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/janus-idp-backstage-plugin-analytics-provider-segment/package.json ./dynamic-plugins/wrappers/janus-idp-backstage-plugin-analytics-provider-segment/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/janus-idp-backstage-plugin-aap-backend-dynamic/package.json ./dynamic-plugins/wrappers/janus-idp-backstage-plugin-aap-backend-dynamic/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/janus-idp-backstage-plugin-aap-backend-dynamic/dist-dynamic/package.json ./dynamic-plugins/wrappers/janus-idp-backstage-plugin-aap-backend-dynamic/dist-dynamic/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/immobiliarelabs-backstage-plugin-gitlab/package.json ./dynamic-plugins/wrappers/immobiliarelabs-backstage-plugin-gitlab/package.json
Expand Down Expand Up @@ -172,6 +171,7 @@ COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/backstage-community-plugin
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/backstage-community-plugin-azure-devops/package.json ./dynamic-plugins/wrappers/backstage-community-plugin-azure-devops/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/backstage-community-plugin-azure-devops-backend-dynamic/package.json ./dynamic-plugins/wrappers/backstage-community-plugin-azure-devops-backend-dynamic/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/backstage-community-plugin-azure-devops-backend-dynamic/dist-dynamic/package.json ./dynamic-plugins/wrappers/backstage-community-plugin-azure-devops-backend-dynamic/dist-dynamic/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/backstage-community-plugin-analytics-provider-segment/package.json ./dynamic-plugins/wrappers/backstage-community-plugin-analytics-provider-segment/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/backstage-community-plugin-acr/package.json ./dynamic-plugins/wrappers/backstage-community-plugin-acr/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/backstage-community-plugin-3scale-backend-dynamic/package.json ./dynamic-plugins/wrappers/backstage-community-plugin-3scale-backend-dynamic/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/backstage-community-plugin-3scale-backend-dynamic/dist-dynamic/package.json ./dynamic-plugins/wrappers/backstage-community-plugin-3scale-backend-dynamic/dist-dynamic/package.json
Expand Down
2 changes: 1 addition & 1 deletion app-config.dynamic-plugins.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ dynamicPlugins:
props:
width: 1500
height: 800
janus-idp.backstage-plugin-analytics-provider-segment:
backstage-community.plugin-analytics-provider-segment:
apiFactories:
- importName: SegmentAnalyticsApi
backstage-community.plugin-rbac:
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/parfuemerie-douglas-scaffo
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/pagerduty-backstage-plugin/package.json ./dynamic-plugins/wrappers/pagerduty-backstage-plugin/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/pagerduty-backstage-plugin-backend-dynamic/package.json ./dynamic-plugins/wrappers/pagerduty-backstage-plugin-backend-dynamic/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/pagerduty-backstage-plugin-backend-dynamic/dist-dynamic/package.json ./dynamic-plugins/wrappers/pagerduty-backstage-plugin-backend-dynamic/dist-dynamic/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/janus-idp-backstage-plugin-analytics-provider-segment/package.json ./dynamic-plugins/wrappers/janus-idp-backstage-plugin-analytics-provider-segment/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/janus-idp-backstage-plugin-aap-backend-dynamic/package.json ./dynamic-plugins/wrappers/janus-idp-backstage-plugin-aap-backend-dynamic/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/janus-idp-backstage-plugin-aap-backend-dynamic/dist-dynamic/package.json ./dynamic-plugins/wrappers/janus-idp-backstage-plugin-aap-backend-dynamic/dist-dynamic/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/immobiliarelabs-backstage-plugin-gitlab/package.json ./dynamic-plugins/wrappers/immobiliarelabs-backstage-plugin-gitlab/package.json
Expand Down Expand Up @@ -173,6 +172,7 @@ COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/backstage-community-plugin
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/backstage-community-plugin-azure-devops/package.json ./dynamic-plugins/wrappers/backstage-community-plugin-azure-devops/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/backstage-community-plugin-azure-devops-backend-dynamic/package.json ./dynamic-plugins/wrappers/backstage-community-plugin-azure-devops-backend-dynamic/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/backstage-community-plugin-azure-devops-backend-dynamic/dist-dynamic/package.json ./dynamic-plugins/wrappers/backstage-community-plugin-azure-devops-backend-dynamic/dist-dynamic/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/backstage-community-plugin-analytics-provider-segment/package.json ./dynamic-plugins/wrappers/backstage-community-plugin-analytics-provider-segment/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/backstage-community-plugin-acr/package.json ./dynamic-plugins/wrappers/backstage-community-plugin-acr/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/backstage-community-plugin-3scale-backend-dynamic/package.json ./dynamic-plugins/wrappers/backstage-community-plugin-3scale-backend-dynamic/package.json
COPY $EXTERNAL_SOURCE_NESTED/dynamic-plugins/wrappers/backstage-community-plugin-3scale-backend-dynamic/dist-dynamic/package.json ./dynamic-plugins/wrappers/backstage-community-plugin-3scale-backend-dynamic/dist-dynamic/package.json
Expand Down
14 changes: 7 additions & 7 deletions docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Add the following code in your Helm configuration file:
global:
dynamic:
plugins:
- package: './dynamic-plugins/dist/janus-idp-backstage-plugin-analytics-provider-segment'
- package: './dynamic-plugins/dist/backstage-community-plugin-analytics-provider-segment'
disabled: true
```

Expand All @@ -58,7 +58,7 @@ data:
includes:
- dynamic-plugins.default.yaml
plugins:
- package: './dynamic-plugins/dist/janus-idp-backstage-plugin-analytics-provider-segment'
- package: './dynamic-plugins/dist/backstage-community-plugin-analytics-provider-segment'
disabled: true
```

Expand All @@ -70,11 +70,11 @@ However, if you run your application using the `dynamic-plugins.default.yaml` fi
```yaml
dynamicPlugins:
plugins:
- package: './dynamic-plugins/dist/janus-idp-backstage-plugin-analytics-provider-segment'
- package: './dynamic-plugins/dist/backstage-community-plugin-analytics-provider-segment'
disabled: true
```

Than delete the `dynamic-plugins-root/janus-idp-backstage-plugin-analytics-provider-segment` plugin directory, to stop plugin from loading.
Than delete the `dynamic-plugins-root/backstage-community-plugin-analytics-provider-segment` plugin directory, to stop plugin from loading.

### Disabling Telemetry in Continuous Integration (CI) Environments

Expand All @@ -94,7 +94,7 @@ Add the following code in your Helm configuration file:
global:
dynamic:
plugins:
- package: './dynamic-plugins/dist/janus-idp-backstage-plugin-analytics-provider-segment'
- package: './dynamic-plugins/dist/backstage-community-plugin-analytics-provider-segment'
disabled: false
```

Expand All @@ -114,7 +114,7 @@ data:
includes:
- dynamic-plugins.default.yaml
plugins:
- package: './dynamic-plugins/dist/janus-idp-backstage-plugin-analytics-provider-segment'
- package: './dynamic-plugins/dist/backstage-community-plugin-analytics-provider-segment'
disabled: false
```

Expand Down Expand Up @@ -385,4 +385,4 @@ COMING SOON

## Deploying with ArgoCD

COMING SOON
COMING SOON
4 changes: 2 additions & 2 deletions dynamic-plugins.default.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -921,12 +921,12 @@ plugins:
url: ${TECH_RADAR_DATA_URL}


- package: ./dynamic-plugins/dist/janus-idp-backstage-plugin-analytics-provider-segment
- package: ./dynamic-plugins/dist/backstage-community-plugin-analytics-provider-segment
disabled: false
pluginConfig:
dynamicPlugins:
frontend:
janus-idp.backstage-plugin-analytics-provider-segment:
backstage-community.plugin-analytics-provider-segment:
apiFactories:
- importName: SegmentAnalyticsApi
backend:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "janus-idp-backstage-plugin-analytics-provider-segment",
"version": "1.10.0",
"name": "backstage-community-plugin-analytics-provider-segment",
"version": "1.10.2",
"main": "src/index.ts",
"types": "src/index.ts",
"license": "Apache-2.0",
Expand All @@ -11,10 +11,10 @@
},
"backstage": {
"role": "frontend-plugin",
"supported-versions": "1.32.4",
"pluginId": "janus-idp-analytics-provider-segment",
"supported-versions": "1.32.5",
"pluginId": "backstage-community-analytics-provider-segment",
"pluginPackages": [
"janus-idp-backstage-plugin-analytics-provider-segment"
"backstage-community-plugin-analytics-provider-segment"
]
},
"sideEffects": false,
Expand All @@ -28,7 +28,7 @@
"export-dynamic:clean": "janus-cli package export-dynamic-plugin --in-place --clean"
},
"dependencies": {
"@janus-idp/backstage-plugin-analytics-provider-segment": "1.10.0"
"@backstage-community/plugin-analytics-provider-segment": "1.10.2"
},
"devDependencies": {
"@backstage/cli": "0.28.2",
Expand All @@ -39,15 +39,15 @@
"dist-scalprum"
],
"scalprum": {
"name": "janus-idp.backstage-plugin-analytics-provider-segment",
"name": "backstage-community.plugin-analytics-provider-segment",
"exposedModules": {
"PluginRoot": "./src/index.ts"
}
},
"repository": {
"type": "git",
"url": "https://github.com/janus-idp/backstage-showcase",
"directory": "dynamic-plugins/wrappers/janus-idp-backstage-plugin-analytics-provider-segment"
"directory": "dynamic-plugins/wrappers/backstage-community-plugin-analytics-provider-segment"
},
"maintainers": [
"@janus-idp/maintainers-showcase"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from "@backstage-community/plugin-analytics-provider-segment";
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"include": ["src", "dev", "migrations"],
"exclude": ["node_modules"],
"compilerOptions": {
"outDir": "../../../dist-types/dynamic-plugins/wrappers/janus-idp-backstage-plugin-analytics-provider-segment",
"outDir": "../../../dist-types/dynamic-plugins/wrappers/backstage-community-plugin-analytics-provider-segment",
"rootDir": "."
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"extends": ["//"],
"tasks": {
"tsc": {
"outputs": [
"../../../dist-types/dynamic-plugins/wrappers/backstage-community-plugin-analytics-provider-segment/**"
]
}
}
}

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ test.describe('Check RBAC "analytics-provider-segment" plugin', () => {
test("is disabled", async ({ page }) => {
await page
.getByPlaceholder("Filter")
.pressSequentially("backstage-plugin-analytics-provider-segment\n", {
.pressSequentially("plugin-analytics-provider-segment\n", {
delay: 300,
});
const row = page.locator(
UIhelperPO.rowByText(
"janus-idp-backstage-plugin-analytics-provider-segment",
"backstage-community-plugin-analytics-provider-segment",
),
);
expect(await row.locator("td").nth(2).innerText()).toBe("No"); // not enabled
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ test('Check "analytics-provider-segment" plugin is enabled', async () => {
const pluginsList = await analytics.getDynamicPluginsList(authHeader);
const isPluginListed = analytics.checkPluginListed(
pluginsList,
"janus-idp-backstage-plugin-analytics-provider-segment",
"backstage-community-plugin-analytics-provider-segment",
);

expect(isPluginListed).toBe(true);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,8 @@ export const InternalPluginsMap: Record<string, string> = {
'./dynamic-plugins/dist/backstage-community-plugin-tech-radar',
'backstage-community-plugin-tech-radar-backend-dynamic':
'./dynamic-plugins/dist/backstage-community-plugin-tech-radar-backend-dynamic',
'janus-idp-backstage-plugin-analytics-provider-segment':
'./dynamic-plugins/dist/janus-idp-backstage-plugin-analytics-provider-segment',
'backstage-community-plugin-analytics-provider-segment':
'./dynamic-plugins/dist/backstage-community-plugin-analytics-provider-segment',
'parfuemerie-douglas-scaffolder-backend-module-azure-repositories-dynamic':
'./dynamic-plugins/dist/parfuemerie-douglas-scaffolder-backend-module-azure-repositories-dynamic',
'immobiliarelabs-backstage-plugin-gitlab-backend-dynamic':
Expand Down
70 changes: 35 additions & 35 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3307,6 +3307,28 @@ __metadata:
languageName: node
linkType: hard

"@backstage-community/plugin-analytics-provider-segment@npm:1.10.2":
version: 1.10.2
resolution: "@backstage-community/plugin-analytics-provider-segment@npm:1.10.2"
dependencies:
"@backstage/config": ^1.2.0
"@backstage/core-components": ^0.15.1
"@backstage/core-plugin-api": ^1.10.0
"@backstage/theme": ^0.6.0
"@material-ui/core": ^4.9.13
"@material-ui/icons": ^4.11.3
"@material-ui/lab": 4.0.0-alpha.61
"@segment/analytics-next": ^1.58.0
prop-types: ^15.8.1
react-use: ^17.4.0
peerDependencies:
react: ^16.13.1 || ^17.0.0 || ^18.0.0
react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0
react-router-dom: ^6.0.0
checksum: ebc8a2d6fe9094ab3d9c7384a0eaffae226f1148e48488eefbb18358c58ffc775819f1c040c5139e93b3c38c8ad3c3fc8d6056bcf6adc7e09700f19b93cd9b70
languageName: node
linkType: hard

"@backstage-community/plugin-azure-devops-backend@npm:0.7.3":
version: 0.7.3
resolution: "@backstage-community/plugin-azure-devops-backend@npm:0.7.3"
Expand Down Expand Up @@ -10552,28 +10574,6 @@ __metadata:
languageName: node
linkType: hard

"@janus-idp/backstage-plugin-analytics-provider-segment@npm:1.10.0":
version: 1.10.0
resolution: "@janus-idp/backstage-plugin-analytics-provider-segment@npm:1.10.0"
dependencies:
"@backstage/config": ^1.2.0
"@backstage/core-components": ^0.15.1
"@backstage/core-plugin-api": ^1.10.0
"@backstage/theme": ^0.6.0
"@material-ui/core": ^4.9.13
"@material-ui/icons": ^4.11.3
"@material-ui/lab": 4.0.0-alpha.61
"@segment/analytics-next": ^1.58.0
prop-types: ^15.8.1
react-use: ^17.4.0
peerDependencies:
react: ^16.13.1 || ^17.0.0 || ^18.0.0
react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0
react-router-dom: ^6.0.0
checksum: a65c16af591878b7140cf5705a5c99e47bc398ba07c3583bde082ae84bf56581b07dd979af5a13c5687fc3384a00b9da6bf4ea93e7b9c2cf4d3a34900dffd009
languageName: node
linkType: hard

"@janus-idp/backstage-plugin-audit-log-node@npm:1.7.0":
version: 1.7.0
resolution: "@janus-idp/backstage-plugin-audit-log-node@npm:1.7.0"
Expand Down Expand Up @@ -16504,8 +16504,8 @@ __metadata:
linkType: hard

"@segment/analytics-next@npm:^1.58.0":
version: 1.75.0
resolution: "@segment/analytics-next@npm:1.75.0"
version: 1.76.0
resolution: "@segment/analytics-next@npm:1.76.0"
dependencies:
"@lukeed/uuid": ^2.0.0
"@segment/analytics-core": 1.8.0
Expand All @@ -16517,7 +16517,7 @@ __metadata:
node-fetch: ^2.6.7
tslib: ^2.4.1
unfetch: ^4.1.0
checksum: 92bc7ad1b1364e2446d8df3869a87d4014dc2a096248fdbd0c3bda9f2206e482eedbe044f348f21738f4139925d2d1997cff83df0879659c3accf1a4edf2c2b5
checksum: 0819212b39499b4ba5a02dd9c58ed0716bbb236237f458f641842b72f3766620142d57bbb583fb5fe8be13d6d3871ff970f0c76002ebcf691411e92b32089cc7
languageName: node
linkType: hard

Expand Down Expand Up @@ -22433,6 +22433,16 @@ __metadata:
languageName: unknown
linkType: soft

"backstage-community-plugin-analytics-provider-segment@workspace:dynamic-plugins/wrappers/backstage-community-plugin-analytics-provider-segment":
version: 0.0.0-use.local
resolution: "backstage-community-plugin-analytics-provider-segment@workspace:dynamic-plugins/wrappers/backstage-community-plugin-analytics-provider-segment"
dependencies:
"@backstage-community/plugin-analytics-provider-segment": 1.10.2
"@backstage/cli": 0.28.2
"@janus-idp/cli": 1.17.0
languageName: unknown
linkType: soft

"backstage-community-plugin-azure-devops-backend@workspace:dynamic-plugins/wrappers/backstage-community-plugin-azure-devops-backend-dynamic":
version: 0.0.0-use.local
resolution: "backstage-community-plugin-azure-devops-backend@workspace:dynamic-plugins/wrappers/backstage-community-plugin-azure-devops-backend-dynamic"
Expand Down Expand Up @@ -31778,16 +31788,6 @@ __metadata:
languageName: unknown
linkType: soft

"janus-idp-backstage-plugin-analytics-provider-segment@workspace:dynamic-plugins/wrappers/janus-idp-backstage-plugin-analytics-provider-segment":
version: 0.0.0-use.local
resolution: "janus-idp-backstage-plugin-analytics-provider-segment@workspace:dynamic-plugins/wrappers/janus-idp-backstage-plugin-analytics-provider-segment"
dependencies:
"@backstage/cli": 0.28.2
"@janus-idp/backstage-plugin-analytics-provider-segment": 1.10.0
"@janus-idp/cli": 1.17.0
languageName: unknown
linkType: soft

"javascript-natural-sort@npm:^0.7.1":
version: 0.7.1
resolution: "javascript-natural-sort@npm:0.7.1"
Expand Down
Loading