Skip to content

Commit

Permalink
Merge branch 'main' into feat/enable-otlp-loggin
Browse files Browse the repository at this point in the history
  • Loading branch information
arealmaas authored Jan 10, 2025
2 parents 8a81c22 + c331c5e commit 742dbaa
Show file tree
Hide file tree
Showing 22 changed files with 25 additions and 25 deletions.
2 changes: 1 addition & 1 deletion .azure/applications/graphql/main.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ param appConfigurationName string
param environmentKeyVaultName string

var namePrefix = 'dp-be-${environment}'
var baseImageUrl = 'ghcr.io/digdir/dialogporten-'
var baseImageUrl = 'ghcr.io/altinn/dialogporten-'

var tags = {
Environment: environment
Expand Down
2 changes: 1 addition & 1 deletion .azure/applications/service/main.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ param scale Scale = {
}

var namePrefix = 'dp-be-${environment}'
var baseImageUrl = 'ghcr.io/digdir/dialogporten-'
var baseImageUrl = 'ghcr.io/altinn/dialogporten-'
var tags = {
Environment: environment
Product: 'Dialogporten'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ param jobSchedule string
param appInsightConnectionString string

var namePrefix = 'dp-be-${environment}'
var baseImageUrl = 'ghcr.io/digdir/dialogporten-'
var baseImageUrl = 'ghcr.io/altinn/dialogporten-'
var tags = {
FullName: '${namePrefix}-sync-resource-policy-information'
Environment: environment
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ param jobSchedule string
param appInsightConnectionString string

var namePrefix = 'dp-be-${environment}'
var baseImageUrl = 'ghcr.io/digdir/dialogporten-'
var baseImageUrl = 'ghcr.io/altinn/dialogporten-'
var tags = {
FullName: '${namePrefix}-sync-subject-resource-mappings'
Environment: environment
Expand Down
2 changes: 1 addition & 1 deletion .azure/applications/web-api-eu/main.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ param appConfigurationName string
param environmentKeyVaultName string

var namePrefix = 'dp-be-${environment}'
var baseImageUrl = 'ghcr.io/digdir/dialogporten-'
var baseImageUrl = 'ghcr.io/altinn/dialogporten-'
var tags = {
Environment: environment
Product: 'Dialogporten'
Expand Down
2 changes: 1 addition & 1 deletion .azure/applications/web-api-migration-job/main.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ param containerAppEnvironmentName string
param environmentKeyVaultName string

var namePrefix = 'dp-be-${environment}'
var baseImageUrl = 'ghcr.io/digdir/dialogporten-'
var baseImageUrl = 'ghcr.io/altinn/dialogporten-'
var tags = {
Environment: environment
Product: 'Dialogporten'
Expand Down
2 changes: 1 addition & 1 deletion .azure/applications/web-api-so/main.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ param scale Scale = {
}

var namePrefix = 'dp-be-${environment}'
var baseImageUrl = 'ghcr.io/digdir/dialogporten-'
var baseImageUrl = 'ghcr.io/altinn/dialogporten-'
var tags = {
Environment: environment
Product: 'Dialogporten'
Expand Down
8 changes: 4 additions & 4 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
* @digdir/team-dialogporten-backend
.azure/** @digdir/team-dialogporten-backend @digdir/team-dialogporten-infra
.github/** @digdir/team-dialogporten-backend @digdir/team-dialogporten-infra
.github/CODEOWNERS @digdir/team-dialogporten-backend
* @altinn/team-dialogporten-backend
.azure/** @altinn/team-dialogporten-backend @altinn/team-dialogporten-infra
.github/** @altinn/team-dialogporten-backend @altinn/team-dialogporten-infra
.github/CODEOWNERS @altinn/team-dialogporten-backend
2 changes: 1 addition & 1 deletion .github/workflows/ci-cd-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
secrets:
GCR_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
with:
dockerImageBaseName: ghcr.io/digdir/dialogporten-
dockerImageBaseName: ghcr.io/altinn/dialogporten-
version: ${{ needs.get-current-version.outputs.version }}-${{ needs.generate-git-short-sha.outputs.gitShortSha }}

deploy-infra:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-cd-staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:
secrets:
GCR_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
with:
dockerImageBaseName: ghcr.io/digdir/dialogporten-
dockerImageBaseName: ghcr.io/altinn/dialogporten-
version: ${{ needs.get-current-version.outputs.version }}

deploy-apps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-cd-yt01.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
secrets:
GCR_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
with:
dockerImageBaseName: ghcr.io/digdir/dialogporten-
dockerImageBaseName: ghcr.io/altinn/dialogporten-
version: ${{ needs.get-current-version.outputs.version }}

deploy-infra:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ For pull requests, the title must follow [Conventional Commits](https://www.conv
The title of the PR will be used as the commit message when squashing/merging the pull request, and the body of the PR will be used as the description.

This title will be used to generate the changelog (using [Release Please](https://github.com/google-github-actions/release-please-action))
Using `fix` will add to "Bug Fixes", `feat` will add to "Features". All the others,`chore`, `ci`, etc., will be ignored. ([Example release](https://github.com/digdir/dialogporten/releases/tag/v1.12.0))
Using `fix` will add to "Bug Fixes", `feat` will add to "Features". All the others,`chore`, `ci`, etc., will be ignored. ([Example release](https://github.com/altinn/dialogporten/releases/tag/v1.12.0))

## Deployment

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public static class ClaimsPrincipalExtensions


// TODO: This scope is also defined in WebAPI/GQL. Can this be fetched from a common auth lib?
// https://github.com/digdir/dialogporten/issues/647
// https://github.com/altinn/dialogporten/issues/647
// This could be done for all claims/scopes/prefixes etc, there are duplicates
public const string ServiceProviderScope = "digdir:dialogporten.serviceprovider";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ public async Task<GetDialogResult> Handle(GetDialogQuery request, CancellationTo
}

// TODO: What if name lookup fails
// https://github.com/digdir/dialogporten/issues/387
// https://github.com/altinn/dialogporten/issues/387
dialog.UpdateSeenAt(
currentUserInformation.UserId.ExternalIdWithPrefix,
currentUserInformation.UserId.Type,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public async Task<DeleteDialogResult> Handle(DeleteDialogCommand request, Cancel

if (dialog.Deleted)
{
// TODO: https://github.com/digdir/dialogporten/issues/1543
// TODO: https://github.com/altinn/dialogporten/issues/1543
// When restoration is implemented, add a hint to the error message.
return new EntityDeleted<DialogEntity>(request.Id);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public async Task<UpdateDialogResult> Handle(UpdateDialogCommand request, Cancel

if (dialog.Deleted)
{
// TODO: https://github.com/digdir/dialogporten/issues/1543
// TODO: https://github.com/altinn/dialogporten/issues/1543
// When restoration is implemented, add a hint to the error message.
return new EntityDeleted<DialogEntity>(request.Id);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public CreateDialogEndpointSummary()
Description = """
The dialog is created with the given configuration. For more information see the documentation (link TBD).
For detailed information on validation rules, see [the source for CreateDialogCommandValidator](https://github.com/digdir/dialogporten/blob/main/src/Digdir.Domain.Dialogporten.Application/Features/V1/ServiceOwner/Dialogs/Commands/Create/CreateDialogCommandValidator.cs)
For detailed information on validation rules, see [the source for CreateDialogCommandValidator](https://github.com/altinn/dialogporten/blob/main/src/Digdir.Domain.Dialogporten.Application/Features/V1/ServiceOwner/Dialogs/Commands/Create/CreateDialogCommandValidator.cs)
""";

ResponseExamples[StatusCodes.Status201Created] = "018bb8e5-d9d0-7434-8ec5-569a6c8e01fc";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ public static List<TransmissionDto> GenerateFakeDialogTransmissions(int? count =
public static List<ActivityDto> GenerateFakeDialogActivities(int? count = null, DialogActivityType.Values? type = null)
{
// Temporarily removing the ActivityType TransmissionOpened from the list of possible types for random picking.
// Going to have a look at re-writing the generator https://github.com/digdir/dialogporten/issues/1123
// Going to have a look at re-writing the generator https://github.com/altinn/dialogporten/issues/1123
var activityTypes = Enum.GetValues<DialogActivityType.Values>()
.Where(x => x != DialogActivityType.Values.TransmissionOpened).ToList();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public async Task FailIfSwaggerSnapshotDoesNotMatch()
// Running client.GetAsync("/swagger/v1/swagger.json"); on Windows and Mac will produce
// different ordering of the results (although the content is the same). So we force an
// alphabetical ordering of the properties to make the test deterministic.
// Ref: https://github.com/digdir/dialogporten/issues/996
// Ref: https://github.com/altinn/dialogporten/issues/996
var orderedSwagger = SortJson(newSwagger);

// Assert
Expand Down
2 changes: 1 addition & 1 deletion tests/k6/tests/enduser/performance/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ k6 run enduser-search.js -e API_VERSION=v1 \

### From GitHub Actions
To run the performance test using GitHub Actions, follow these steps:
1. Go to the [GitHub Actions](https://github.com/digdir/dialogporten/actions/workflows/dispatch-k6-performance.yml) page.
1. Go to the [GitHub Actions](https://github.com/altinn/dialogporten/actions/workflows/dispatch-k6-performance.yml) page.
2. Select "Run workflow" and fill in the required parameters.
3. Tag the performance test with a descriptive name.

Expand Down
2 changes: 1 addition & 1 deletion tests/k6/tests/graphql/performance/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ k6 run graphql-search.js -e API_VERSION=v1 \
4. Refer to the k6 documentation for more information on usage.
### From GitHub Actions
To run the performance test using GitHub Actions, follow these steps:
1. Go to the [GitHub Actions](https://github.com/digdir/dialogporten/actions/workflows/dispatch-k6-performance.yml) page.
1. Go to the [GitHub Actions](https://github.com/altinn/dialogporten/actions/workflows/dispatch-k6-performance.yml) page.
2. Select "Run workflow" and fill in the required parameters.
3. Tag the performance test with a descriptive name.

Expand Down
2 changes: 1 addition & 1 deletion tests/k6/tests/serviceowner/performance/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ k6 run <test-file> -e API_VERSION=v1 \

#### From GitHub Actions
To run the performance test using GitHub Actions, follow these steps:
1. Go to the [GitHub Actions](https://github.com/digdir/dialogporten/actions/workflows/dispatch-k6-performance.yml) page.
1. Go to the [GitHub Actions](https://github.com/altinn/dialogporten/actions/workflows/dispatch-k6-performance.yml) page.
2. Select "Run workflow" and fill in the required parameters.
3. Tag the performance test with a descriptive name.

Expand Down

0 comments on commit 742dbaa

Please sign in to comment.