Skip to content

Commit

Permalink
Merge pull request #1 from Energinet-DataHub/renetnielsen/ci-cd
Browse files Browse the repository at this point in the history
fix ci-cd
  • Loading branch information
René T. Nielsen authored Jan 31, 2022
2 parents c29fc9d + 50f3a27 commit 4d5338a
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 218 deletions.
22 changes: 3 additions & 19 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,6 @@ on:
jobs:
ci_base:
uses: Energinet-DataHub/.github/.github/workflows/[email protected]

dotnet_solution_ci:
uses: Energinet-DataHub/.github/.github/workflows/[email protected]
with:
SOLUTION_FILE_PATH: 'source/Energinet.DataHub.ActorRegistry.sln'
DOTNET_VERSION: '5.0'
USE_AZURITE: true
USE_AZURE_FUNCTIONS_CORE_TOOLS: true
USE_SQLLOCALDB_2019: true
secrets:
AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
AZURE_SPN_ID: ${{ secrets.AZURE_SPN_ID }}
AZURE_SPN_SECRET: ${{ secrets.AZURE_SPN_SECRET }}
AZURE_KEYVAULT_URL: ${{ secrets.AZURE_KEYVAULT_URL }}
AZURE_SECRETS_KEYVAULT_URL: ${{ secrets.AZURE_SECRETS_KEYVAULT_URL }}

terraform_validate:
uses: Energinet-DataHub/.github/.github/workflows/[email protected]
Expand All @@ -47,8 +31,8 @@ jobs:
TERRAFORM_VERSION: '1.1.4'

database_migration_ci:
needs: [ci_base, terraform_validate, dotnet_solution_ci]
uses: Energinet-DataHub/.github/.github/workflows/dotnet-create-function[email protected]
needs: [ci_base, terraform_validate]
uses: Energinet-DataHub/.github/.github/workflows/dotnet-create-webapi[email protected]
with:
CSPROJ_FILE_PATH: 'source/Energinet.DataHub.ActorRegistry.ApplyDBMigrationsApp/Energinet.DataHub.ActorRegistry.ApplyDBMigrationsApp.csproj'
DOTNET_VERSION: '5.0.404'
Expand All @@ -60,6 +44,6 @@ jobs:
]
uses: Energinet-DataHub/.github/.github/workflows/[email protected]
with:
CALLER_REPOSITORY_PATH: Energinet-DataHub/geh-metering-point
CALLER_REPOSITORY_PATH: Energinet-DataHub/geh-actor-registry
secrets:
PAT_TOKEN: ${{ secrets.PAT_TOKEN }}
41 changes: 0 additions & 41 deletions NOTICE.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,44 +3,3 @@
Energinet and any contributors reserve all others rights, whether under their respective copyrights, patents, licenses, or trademarks, whether by implication, estoppel or otherwise.

It is our intention to acknowledge all third-party product licenses used in this document. If you miss your license please contact [email protected], and we will take action to change the file.

## Third-Party Licenses

The Green Energy Hub repository relies on open source libraries and tools. We recommend you read their licenses, as their terms may differ from the terms described in our LICENSE.

| Name | Version | Url | License |
| ----------------------------------- | ------- | ------------------------------------------------------------------ | -------------------------- |
| `.NET Core` | 3.1 | <https://dotnet.microsoft.com/download/dotnet/3.1> | MIT |
| `BenchmarkDotnet` | 0.12.1 | <https://www.nuget.org/packages/BenchmarkDotNet/0.12.1> | MIT |
| `coverlet.collector` | 1.2.0 | <https://www.nuget.org/packages/coverlet.collector/1.2.0> | MIT |
| `dotnet-reportgenerator-globaltool` | Current | <https://www.nuget.org/packages/dotnet-reportgenerator-globaltool> | Apache-2.0 |
| `FluentAssertions` | 5.10.3 | <https://www.nuget.org/packages/FluentAssertions/5.10.3> | Apache-2.0 |
| `NSubstitute` | 4.2.2 | <https://www.nuget.org/packages/NSubstitute/4.2.2> | BSD-3-Clause |
| `Stylecop.Analyzers` | 1.1.118 | <https://www.nuget.org/packages/StyleCop.Analyzers/1.1.118> | Apache 2.0 |
| `Terraform` | 1.2.1 | <https://terraform.io> | Mozilla Public License 2.0 |
| `xunit` | 2.4.1 | <https://www.nuget.org/packages/xunit/2.4.1> | Apache-2.0 |
| `xunit.runner.visualstudio` | 2.4.3 | <https://www.nuget.org/packages/xunit.runner.visualstudio/2.4.3> | MIT |

<br/>

### GitHub Actions

| Action | Url | License |
| ---------------------------------------------------- | -------------------------------------------------------------------- | ---------------------- |
| `Azure CLI` | <https://aka.ms/InstallAzureCLIDeb> | MIT |
| `Azure/functions-action@v1` | <https://github.com/Azure/functions-action> | MIT |
| `actions/checkout@master` | <https://github.com/actions/checkout> | MIT |
| `actions/checkout@master` | <https://github.com/actions/checkout> | MIT |
| `codecov/codecov-action@v1` | <https://github.com/codecov/codecov-action> | MIT |
| `actions/download-artifact@v2` | <https://github.com/actions/download-artifact> | MIT |
| `actions/setup-dotnet@v1` | <https://github.com/actions/setup-dotnet> | MIT |
| `actions/setup-python@v2` | <https://github.com/actions/setup-python> | MIT |
| `actions/upload-artifact@v2` | <https://github.com/actions/upload-artifact> | MIT |
| `avto-dev/markdown-lint@v1` | <https://github.com/actionshub/markdownlint> | Apache-2.0 |
| `fkirc/[email protected]` | <https://github.com/fkirc/skip-duplicate-actions> | MIT |
| `gaurav-nelson/github-action-markdown-link-check@v1` | <https://github.com/gaurav-nelson/github-action-markdown-link-check> | MIT |
| `hashicorp/[email protected]` | <https://github.com/hashicorp/setup-terraform> | MPL-2.0 |
| `kt3k/[email protected]` | <https://github.com/kt3k/license_checker> | Blue Oak Model License |
| `peter-evans/repository-dispatch@v1` | <https://github.com/peter-evans/repository-dispatch> | MIT |
| `rojopolis/[email protected]` | <https://github.com/rojopolis/spellcheck-github-actions> | MIT |
| `xt0rted/markdownlint-problem-matcher@v1` | <https://github.com/xt0rted/markdownlint-problem-matcher> | MIT |
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# ActorRegistry

TBD
TBD
2 changes: 1 addition & 1 deletion build/infrastructure/main/mssqldb-registry.tf
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ module "kvs_sql_ms_actor_register_database_name" {

name = "mssql-actor-register-database-name"
value = module.mssqldb_actor_register.name
key_vault_id = module.kv_shared.id
key_vault_id = data.azurerm_key_vault.kv_shared_resources.id

tags = azurerm_resource_group.this.tags
}
160 changes: 4 additions & 156 deletions wordlist.txt
Original file line number Diff line number Diff line change
@@ -1,162 +1,10 @@
BenchmarkDotNet
DataHub
codecov
github
Energinet
IaC
mergeable
Terraform
MeteringPoints
md
Roadmap
TBD
TODO
ADR
TSO
FluentAssertions
NSubstitute
StyleCop
Url
dotnet
globaltool
https
io
microsoft
nuget
reportgenerator
terraform
visualstudio
www
xunit
InstallAzureCLIDeb
MPL
Url
actionshub
dotnet
evans
fkirc
gaurav
hashicorp
https
markdownlint
matcher
rojopolis
rted
terraform
xt
ActorRegistry
ApplyDBMigrationsApp
dk
energinet
Energinet
greenenergyhub
thirdparty
GSRN
Dxx
MeteringPointCreated
CoS
ie
sql
TBD
yyyyMMddHHmm
ApplyDBMigrationsApp
MeteringPointCancelled
MeteringPointClosed
MeteringPointConnected
MeteringPointCreatedEvent
MeteringPointDisconnected
ParentCoupled
ParentDecoupled
MeteringPointCancelled
MPs
Gsrn
MeteringPointClosedMessage
EffectiveDate
eg
fromGrid
toGrid
meterReadingPeriodicity
meteringGridArea
meteringMethod
meteringPointType
netSettlementGroup
parentMeteringPointGsrn
quantityUnit
settlementMethod
parentMeteringPointGsrn
connectionState
AssetType
CCR
DARReference
DDM
EAN
HH
KWT
MPs
MVAr
MWH
MWh
Subtype
TNE
TypeOfMP
UUID
VE
YYYY
alloved
api
childs
kVArh
proces
subtype
ukendt
proto
MeteringMethodChanged
NetSettlementGroupChanged
SettlementDetailsChanged
IntegrationEventContract
IntegrationEventEnvelope
IntegrationEvents
MeteringPointConnectedIntegrationEvent
ConsumptionMeteringPointCreated
CreateMeteringPoint
IntegrationEvents
ProductType
UnitType
ProductionMeteringPointCreated
ExchangeMeteringPointCreated
meteringMethodChangedMessage
meteringPointCancelledMessage
meteringPointClosedMessage
meteringPointCreatedMessage
meteringPointDisconnectedMessage
netSettlementGroupChangedMessage
parentCoupledMessage
parentDecoupledMessage
settlementDetailsChangedMessage
gsrn
meteringpoint
MeteringPointConnectedIntegrationEvent
protobuf
MRP
NSG
ENERGYACTIVE
ENERGYREACTIVE
FUELQUANTITY
POWERACTIVE
POWERREACTIVE
NONPROFILED
GWH
WH
Bignum
ByteString
FalseClass
Fixnum
TrueClass
UTF
bool
boolean
sfixed
sint
str
uint
ulong
unicode
NINETYNINE
MessageHub
NuGet

0 comments on commit 4d5338a

Please sign in to comment.