From 5c2bd4966a2e1644f0a70ee0e8cfce6138c7e663 Mon Sep 17 00:00:00 2001
From: Gerd Oberlechner <goberlec@redhat.com>
Date: Thu, 28 Nov 2024 12:35:17 +0100
Subject: [PATCH] move key-vault-cert module to keyvault folder

Signed-off-by: Gerd Oberlechner <goberlec@redhat.com>
---
 .../modules/{ => keyvault}/key-vault-cert.bicep             | 4 ++--
 .../modules/maestro/maestro-access-cert.bicep               | 2 +-
 dev-infrastructure/templates/mock-identities.bicep          | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename dev-infrastructure/modules/{ => keyvault}/key-vault-cert.bicep (92%)

diff --git a/dev-infrastructure/modules/key-vault-cert.bicep b/dev-infrastructure/modules/keyvault/key-vault-cert.bicep
similarity index 92%
rename from dev-infrastructure/modules/key-vault-cert.bicep
rename to dev-infrastructure/modules/keyvault/key-vault-cert.bicep
index ff0698b75..090684dd8 100644
--- a/dev-infrastructure/modules/key-vault-cert.bicep
+++ b/dev-infrastructure/modules/keyvault/key-vault-cert.bicep
@@ -16,7 +16,7 @@ param force bool = false
 var boolstring = force == false ? '$false' : '$true'
 param validityInMonths int = 12
 
-module certificateOfficerAccess 'keyvault/keyvault-secret-access.bicep' = {
+module certificateOfficerAccess 'keyvault-secret-access.bicep' = {
   name: 'kv-cert-officer-access-${keyVaultName}-${uniqueString(keyVaultManagedIdentityId)}'
   params: {
     keyVaultName: keyVaultName
@@ -38,7 +38,7 @@ resource newCertwithRotationKV 'Microsoft.Resources/deploymentScripts@2023-08-01
   properties: {
     azPowerShellVersion: '12.0.0'
     arguments: ' -VaultName ${keyVaultName} -ValidityInMonths ${validityInMonths} -IssuerName ${issuerName} -CertName ${certName} -SubjectName ${subjectName} -DnsNames ${join(dnsNames,'_')} -Force ${boolstring}'
-    scriptContent: loadTextContent('../scripts/key-vault-cert.ps1')
+    scriptContent: loadTextContent('../../scripts/key-vault-cert.ps1')
     forceUpdateTag: now
     cleanupPreference: 'Always'
     retentionInterval: 'P1D'
diff --git a/dev-infrastructure/modules/maestro/maestro-access-cert.bicep b/dev-infrastructure/modules/maestro/maestro-access-cert.bicep
index 8df4b260b..6b8cd66cb 100644
--- a/dev-infrastructure/modules/maestro/maestro-access-cert.bicep
+++ b/dev-infrastructure/modules/maestro/maestro-access-cert.bicep
@@ -37,7 +37,7 @@ param certificateAccessManagedIdentityPrincipalId string
 
 var clientAuthenticationName = '${clientName}.${certDomain}'
 
-module clientCertificate '../key-vault-cert.bicep' = {
+module clientCertificate '../keyvault/key-vault-cert.bicep' = {
   name: '${clientName}-client-cert'
   params: {
     keyVaultName: keyVaultName
diff --git a/dev-infrastructure/templates/mock-identities.bicep b/dev-infrastructure/templates/mock-identities.bicep
index cf50db257..695792fa1 100644
--- a/dev-infrastructure/templates/mock-identities.bicep
+++ b/dev-infrastructure/templates/mock-identities.bicep
@@ -14,7 +14,7 @@ param globalResourceGroupName string = 'global'
 // F I R S T   P A R T Y   I D E N T I T Y
 //
 
-module firstPartyIdentity '../modules/key-vault-cert.bicep' = {
+module firstPartyIdentity '../modules/keyvault/key-vault-cert.bicep' = {
   name: 'first-party-identity'
   params: {
     location: location
@@ -54,7 +54,7 @@ resource customRole 'Microsoft.Authorization/roleDefinitions@2022-04-01' = {
 // A R M   H E L P E R   I D E N T I T Y
 //
 
-module armHelperIdentity '../modules/key-vault-cert.bicep' = {
+module armHelperIdentity '../modules/keyvault/key-vault-cert.bicep' = {
   name: 'arm-helper-identity'
   params: {
     location: location
@@ -72,7 +72,7 @@ module armHelperIdentity '../modules/key-vault-cert.bicep' = {
 // M S I   R P   M O CK   I D E N T I T Y
 //
 
-module msiRPMockIdentity '../modules/key-vault-cert.bicep' = {
+module msiRPMockIdentity '../modules/keyvault/key-vault-cert.bicep' = {
   name: 'msi-mock-identity'
   params: {
     location: location