Skip to content
Closed
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
7 changes: 7 additions & 0 deletions .github/workflows/build-and-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,13 @@ jobs:
pull-requests: write

steps:
- name: Set Airbyte
if: (contains(github.event.pull_request.labels.*.name, 'airbyte'))
run: |
echo "TF_VAR_pg_airbyte_enabled=true" >> $GITHUB_ENV
echo "TF_VAR_airbyte_enabled=true" >> $GITHUB_ENV
echo "TF_VAR_connection_status=active" >> $GITHUB_ENV

- name: Deploy App to Review
id: deploy_review
uses: DFE-Digital/github-actions/deploy-to-aks@master
Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/delete-review-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,13 @@ jobs:
echo "AZURE_RESOURCE_PREFIX=${AZURE_RESOURCE_PREFIX}" >> $GITHUB_ENV
echo "CONFIG_SHORT=${CONFIG_SHORT}" >> $GITHUB_ENV

- name: Set Airbyte
if: (contains(github.event.pull_request.labels.*.name, 'airbyte'))
run: |
echo "TF_VAR_pg_airbyte_enabled=true" >> $GITHUB_ENV
echo "TF_VAR_airbyte_enabled=true" >> $GITHUB_ENV
echo "TF_VAR_connection_status=active" >> $GITHUB_ENV

- name: Delete Review App
id: delete-review-app
uses: DFE-Digital/github-actions/delete-review-app@master
Expand Down
2 changes: 1 addition & 1 deletion global_config/review.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ CONFIG_SHORT=rv
AZURE_SUBSCRIPTION=s189-teacher-services-cloud-test
AZURE_RESOURCE_PREFIX=s189t01
KV_PURGE_PROTECTION=false
TERRAFORM_MODULES_TAG=main
TERRAFORM_MODULES_TAG=main
26 changes: 23 additions & 3 deletions src/DfE.CheckPerformanceData.Infrastructure/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
},
"DfeAnalytics.Core": {
"type": "Direct",
"requested": "[0.6.2, )",
"resolved": "0.6.2",
"contentHash": "LIW1zpoLKWPt2017anc4xtmoPrsqV/EifFTJMhwA1/ZT3XJZp/AVj7KTsYcy3FJSCIbvPyAjpdfjFV53tIPd6g==",
"requested": "[0.6.4, )",
"resolved": "0.6.4",
"contentHash": "LfmZAaetqxonAFkZSeY0M3udvzyc35QGEgDTm5ohXocTQZNOks/iqBs7tOQ7LOEw4B6cXp6aE1MGzbdsWOKIyQ==",
"dependencies": {
"Google.Apis.Auth": "1.71.0",
"Google.Cloud.BigQuery.V2": "[3.0.0, 4.0.0)",
Expand Down Expand Up @@ -680,6 +680,11 @@
"resolved": "7.0.0",
"contentHash": "GLltyqEsE5/3IE+zYRP5sNa1l44qKl9v+bfdMcwg+M9qnQf47wK3H0SUR/T+3N4JEQXF3vV4CSuuo0rsg+nq2A=="
},
"System.CommandLine": {
"type": "Transitive",
"resolved": "2.0.0",
"contentHash": "Bjklzc5NoxqAGFi7BcGlY2TWAdB06Bq3a5sfRr3ubMRU80Mf98eyq3Y2UgR6xRV0TLznZmfe5T7mUjOunRNcdA=="
},
"System.IO.Hashing": {
"type": "Transitive",
"resolved": "10.0.9",
Expand Down Expand Up @@ -728,6 +733,7 @@
"dependencies": {
"DfE.CheckPerformanceData.Application": "[1.0.0, )",
"DfE.CheckPerformanceData.Domain": "[1.0.0, )",
"DfeAnalytics.EFCore": "[0.6.4, )",
"Microsoft.EntityFrameworkCore": "[10.0.13, )",
"Microsoft.EntityFrameworkCore.Relational": "[10.0.13, )",
"Microsoft.Extensions.Configuration.Abstractions": "[10.0.13, )",
Expand All @@ -753,6 +759,20 @@
"System.IO.Hashing": "10.0.9"
}
},
"DfeAnalytics.EFCore": {
"type": "CentralTransitive",
"requested": "[0.6.4, )",
"resolved": "0.6.4",
"contentHash": "t4Rw5dqWcNNsKm6hTxoTdomrfDskb2SEt70Wo7dhnKixJqkmlmcjSpoueKZcES5fogTpg87cNKLLXLkh51Cqsg==",
"dependencies": {
"DfeAnalytics.Core": "0.6.4",
"Microsoft.EntityFrameworkCore": "10.0.0",
"Microsoft.Extensions.Hosting.Abstractions": "10.0.0",
"Microsoft.Extensions.Http": "10.0.9",
"Npgsql.EntityFrameworkCore.PostgreSQL": "10.0.0",
"System.CommandLine": "2.0.0"
}
},
"HtmlSanitizer": {
"type": "CentralTransitive",
"requested": "[9.2.1039, )",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="DfeAnalytics.EFCore" />
<PackageReference Include="Microsoft.EntityFrameworkCore" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design">
Expand Down
195 changes: 193 additions & 2 deletions src/DfE.CheckPerformanceData.Persistence/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,20 @@
"version": 2,
"dependencies": {
"net10.0": {
"DfeAnalytics.EFCore": {
"type": "Direct",
"requested": "[0.6.4, )",
"resolved": "0.6.4",
"contentHash": "t4Rw5dqWcNNsKm6hTxoTdomrfDskb2SEt70Wo7dhnKixJqkmlmcjSpoueKZcES5fogTpg87cNKLLXLkh51Cqsg==",
"dependencies": {
"DfeAnalytics.Core": "0.6.4",
"Microsoft.EntityFrameworkCore": "10.0.0",
"Microsoft.Extensions.Hosting.Abstractions": "10.0.0",
"Microsoft.Extensions.Http": "10.0.9",
"Npgsql.EntityFrameworkCore.PostgreSQL": "10.0.0",
"System.CommandLine": "2.0.0"
}
},
"Microsoft.EntityFrameworkCore": {
"type": "Direct",
"requested": "[10.0.13, )",
Expand Down Expand Up @@ -101,11 +115,79 @@
"AngleSharp": "[1.5.0, 2.0.0)"
}
},
"Google.Api.Gax": {
"type": "Transitive",
"resolved": "4.0.0",
"contentHash": "2Q4RruOjUawrtjTazANpp+MNB1M2E8nj2A1kweU1zF0OoNDKUnAIlMbDXs3d+kgcuj/zUVa89/nYot5UZICBWA==",
"dependencies": {
"Microsoft.Bcl.AsyncInterfaces": "6.0.0",
"Newtonsoft.Json": "13.0.1"
}
},
"Google.Api.Gax.Rest": {
"type": "Transitive",
"resolved": "4.0.0",
"contentHash": "YFoxv4UNP7Hn8Eask0FqwMbCAfBs5hUlzronJgFGVXcStohtKc0Mi+2YqgGN82nynx75jVWEF7siSLBwkmZsHA==",
"dependencies": {
"Google.Api.Gax": "4.0.0",
"Google.Apis.Auth": "[1.57.0, 2.0.0)",
"Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0"
}
},
"Google.Apis": {
"type": "Transitive",
"resolved": "1.71.0",
"contentHash": "xKVk+SLZXeBPKuEKzNTg2K7ptr5ZL40+VSR8e5+yJbzTE9uRCCDPlAzT/ij3urh4usBsn5IiW5rXQI+xAc3bRQ==",
"dependencies": {
"Google.Apis.Core": "1.71.0"
}
},
"Google.Apis.Auth": {
"type": "Transitive",
"resolved": "1.71.0",
"contentHash": "AshxDrFfj0QQPkmGQWvWhT+iZ8Vif23hLa9mFZ6cnbwvfXmXwXOWK9bP6uWnLj+sO6otAYKm+7SMZYgwi1AdJA==",
"dependencies": {
"Google.Apis": "1.71.0",
"Google.Apis.Core": "1.71.0",
"System.Management": "7.0.2"
}
},
"Google.Apis.Bigquery.v2": {
"type": "Transitive",
"resolved": "1.57.0.2704",
"contentHash": "soEgBHVrONkBjjFywp0rqFuBTO/Ok/jYVjc2784hY4BjW1l1C6Q30d9hgWQDFa2MWLem4PDrlFRr+sK1lYEBug==",
"dependencies": {
"Google.Apis": "1.57.0",
"Google.Apis.Auth": "1.57.0"
}
},
"Google.Apis.Core": {
"type": "Transitive",
"resolved": "1.71.0",
"contentHash": "tCsg4USOGBVCIrSOyLht1akZe/+ioH7+LVWix6XuxP5fFiw5kEFSBXL+Of93aK/ztJa1dQI+p03dJ+AKgViRuw==",
"dependencies": {
"Newtonsoft.Json": "13.0.3"
}
},
"Google.Cloud.BigQuery.V2": {
"type": "Transitive",
"resolved": "3.0.0",
"contentHash": "2P4+4qIRPBt8wuGhq+78m6IkIilJBuPgs7nU/NweIZzxpK9JI0BiPzWzUmci62FAH5z2Rc+q1GX/21TEzjIkcQ==",
"dependencies": {
"Google.Api.Gax.Rest": "[4.0.0, 5.0.0)",
"Google.Apis.Bigquery.v2": "[1.57.0.2704, 2.0.0)"
}
},
"Humanizer.Core": {
"type": "Transitive",
"resolved": "2.14.1",
"contentHash": "lQKvtaTDOXnoVJ20ibTuSIOf2i0uO0MPbDhd1jm238I+U/2ZnRENj0cktKZhtchBMtCUSRQ5v4xBCUbKNmyVMw=="
},
"Microsoft.Bcl.AsyncInterfaces": {
"type": "Transitive",
"resolved": "6.0.0",
"contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg=="
},
"Microsoft.Build.Framework": {
"type": "Transitive",
"resolved": "18.0.2",
Expand Down Expand Up @@ -198,11 +280,68 @@
"Microsoft.Extensions.Primitives": "10.0.13"
}
},
"Microsoft.Extensions.Configuration": {
"type": "Transitive",
"resolved": "10.0.9",
"contentHash": "woZsWLhOQsASuxbmgiZJqiGUBNo3IjRdXC92xt8rRokza+P6/nIsnzq7sm9Or6ZYcRl2kL1ufj8HVzp1QlPTXw==",
"dependencies": {
"Microsoft.Extensions.Configuration.Abstractions": "10.0.9",
"Microsoft.Extensions.Primitives": "10.0.9"
}
},
"Microsoft.Extensions.Configuration.Binder": {
"type": "Transitive",
"resolved": "10.0.9",
"contentHash": "Tp/+LPb70RyjjtLg9m5C959eP4KrUpJHThZfAegZVpsfmGvzfuNkuYbI/ft+LvXhMSyUcAeOPaN6rzTccwnZAg==",
"dependencies": {
"Microsoft.Extensions.Configuration": "10.0.9",
"Microsoft.Extensions.Configuration.Abstractions": "10.0.9"
}
},
"Microsoft.Extensions.DependencyModel": {
"type": "Transitive",
"resolved": "10.0.13",
"contentHash": "6TyllZsToy3S/Ziu67GddljRTttuVJ8bbrbVUrsdHqH5678Oax5MpaEubxLoPoWLvgUBYo4KfcAig0mkBtktXQ=="
},
"Microsoft.Extensions.Diagnostics": {
"type": "Transitive",
"resolved": "10.0.9",
"contentHash": "NLXI3PbTe39q6/sgs7JYhmfPf7bMzReUoAJ0q9Po6yhfM+0anZa7PrEva4W2SdiLWGyB9eKZS9THGt2BP40xJg==",
"dependencies": {
"Microsoft.Extensions.Configuration": "10.0.9",
"Microsoft.Extensions.Diagnostics.Abstractions": "10.0.9",
"Microsoft.Extensions.Options.ConfigurationExtensions": "10.0.9"
}
},
"Microsoft.Extensions.Diagnostics.Abstractions": {
"type": "Transitive",
"resolved": "10.0.9",
"contentHash": "86RgyFsmVslW4Nu28IXgt8tLglynGQrwjk/xhGZaTe8j6YIeR1Ywoc42hSHsBSl920CQdfqq2dBohZiGm3AkUA==",
"dependencies": {
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.9",
"Microsoft.Extensions.Options": "10.0.9"
}
},
"Microsoft.Extensions.FileProviders.Abstractions": {
"type": "Transitive",
"resolved": "10.0.0",
"contentHash": "/ppSdehKk3fuXjlqCDgSOtjRK/pSHU8eWgzSHfHdwVm5BP4Dgejehkw+PtxKG2j98qTDEHDst2Y99aNsmJldmw==",
"dependencies": {
"Microsoft.Extensions.Primitives": "10.0.0"
}
},
"Microsoft.Extensions.Hosting.Abstractions": {
"type": "Transitive",
"resolved": "10.0.0",
"contentHash": "KrN6TGFwCwqOkLLk/idW/XtDQh+8In+CL9T4M1Dx+5ScsjTq4TlVbal8q532m82UYrMr6RiQJF2HvYCN0QwVsA==",
"dependencies": {
"Microsoft.Extensions.Configuration.Abstractions": "10.0.0",
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.0",
"Microsoft.Extensions.Diagnostics.Abstractions": "10.0.0",
"Microsoft.Extensions.FileProviders.Abstractions": "10.0.0",
"Microsoft.Extensions.Logging.Abstractions": "10.0.0"
}
},
"Microsoft.Extensions.Logging": {
"type": "Transitive",
"resolved": "10.0.13",
Expand Down Expand Up @@ -230,6 +369,18 @@
"Microsoft.Extensions.Primitives": "10.0.13"
}
},
"Microsoft.Extensions.Options.ConfigurationExtensions": {
"type": "Transitive",
"resolved": "10.0.9",
"contentHash": "Y4E24zffF/aPS0igNvY6ZzAQfbxd6AYdC9L4brnH+uK0yYYHIR6FeGVQVVjAOo8wub1EQDl2B90lCcpqoTF7Yw==",
"dependencies": {
"Microsoft.Extensions.Configuration.Abstractions": "10.0.9",
"Microsoft.Extensions.Configuration.Binder": "10.0.9",
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.9",
"Microsoft.Extensions.Options": "10.0.9",
"Microsoft.Extensions.Primitives": "10.0.9"
}
},
"Microsoft.Extensions.Primitives": {
"type": "Transitive",
"resolved": "10.0.13",
Expand Down Expand Up @@ -258,8 +409,13 @@
},
"System.CodeDom": {
"type": "Transitive",
"resolved": "6.0.0",
"contentHash": "CPc6tWO1LAer3IzfZufDBRL+UZQcj5uS207NHALQzP84Vp/z6wF0Aa0YZImOQY8iStY0A2zI/e3ihKNPfUm8XA=="
"resolved": "7.0.0",
"contentHash": "GLltyqEsE5/3IE+zYRP5sNa1l44qKl9v+bfdMcwg+M9qnQf47wK3H0SUR/T+3N4JEQXF3vV4CSuuo0rsg+nq2A=="
},
"System.CommandLine": {
"type": "Transitive",
"resolved": "2.0.0",
"contentHash": "Bjklzc5NoxqAGFi7BcGlY2TWAdB06Bq3a5sfRr3ubMRU80Mf98eyq3Y2UgR6xRV0TLznZmfe5T7mUjOunRNcdA=="
},
"System.Composition": {
"type": "Transitive",
Expand Down Expand Up @@ -309,6 +465,14 @@
"System.Composition.Runtime": "9.0.0"
}
},
"System.Management": {
"type": "Transitive",
"resolved": "7.0.2",
"contentHash": "/qEUN91mP/MUQmJnM5y5BdT7ZoPuVrtxnFlbJ8a3kBJGhe2wCzBfnPFtK2wTtEEcf3DMGR9J00GZZfg6HRI6yA==",
"dependencies": {
"System.CodeDom": "7.0.0"
}
},
"dfe.checkperformancedata.application": {
"type": "Project",
"dependencies": {
Expand All @@ -330,6 +494,19 @@
"resolved": "1.8.5",
"contentHash": "BUgFIpmkjwMPi6QneHUHaprjUOGSXoWEF/xi/2seHCpnI8XMHACNiC09rn9qL8jbxrP8jWyJ3DnOjsGvXWNGmw=="
},
"DfeAnalytics.Core": {
"type": "CentralTransitive",
"requested": "[0.6.4, )",
"resolved": "0.6.4",
"contentHash": "LfmZAaetqxonAFkZSeY0M3udvzyc35QGEgDTm5ohXocTQZNOks/iqBs7tOQ7LOEw4B6cXp6aE1MGzbdsWOKIyQ==",
"dependencies": {
"Google.Apis.Auth": "1.71.0",
"Google.Cloud.BigQuery.V2": "[3.0.0, 4.0.0)",
"Microsoft.Extensions.Configuration": "8.0.0",
"Microsoft.Extensions.Logging": "8.0.0",
"Microsoft.Extensions.Options": "8.0.0"
}
},
"HtmlSanitizer": {
"type": "CentralTransitive",
"requested": "[9.2.1039, )",
Expand Down Expand Up @@ -363,6 +540,20 @@
"dependencies": {
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.13"
}
},
"Microsoft.Extensions.Http": {
"type": "CentralTransitive",
"requested": "[10.0.13, )",
"resolved": "10.0.9",
"contentHash": "5jdmuLRg1HO7x/v8McOf6ndhkMQWImkRBtJpXM8+xIocXNdLqCItyyFLKusdILc62TDzHuLlqaWoxtOA5FFOPg==",
"dependencies": {
"Microsoft.Extensions.Configuration.Abstractions": "10.0.9",
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.9",
"Microsoft.Extensions.Diagnostics": "10.0.9",
"Microsoft.Extensions.Logging": "10.0.9",
"Microsoft.Extensions.Logging.Abstractions": "10.0.9",
"Microsoft.Extensions.Options": "10.0.9"
}
}
}
}
Expand Down
Loading
Loading