From 1e773c4695eb2d1a08e2810d1c634cf25137958a Mon Sep 17 00:00:00 2001 From: MrMCake Date: Mon, 5 Sep 2022 17:32:27 +0200 Subject: [PATCH 1/8] Updated Web\sites to new dependencies approach --- .github/workflows/ms.web.staticsites.yml | 3 +- .../.test/default/dependencies.bicep | 42 +++++++++++ .../.test/default/deploy.test.bicep | 69 +++++++++++++++++++ .../staticSites/.test/min.parameters.json | 9 --- .../staticSites/.test/min/deploy.test.bicep | 37 ++++++++++ .../staticSites/.test/parameters.json | 50 -------------- 6 files changed, 149 insertions(+), 61 deletions(-) create mode 100644 modules/Microsoft.Web/staticSites/.test/default/dependencies.bicep create mode 100644 modules/Microsoft.Web/staticSites/.test/default/deploy.test.bicep delete mode 100644 modules/Microsoft.Web/staticSites/.test/min.parameters.json create mode 100644 modules/Microsoft.Web/staticSites/.test/min/deploy.test.bicep delete mode 100644 modules/Microsoft.Web/staticSites/.test/parameters.json diff --git a/.github/workflows/ms.web.staticsites.yml b/.github/workflows/ms.web.staticsites.yml index 6c02711084..210e1ba4dc 100644 --- a/.github/workflows/ms.web.staticsites.yml +++ b/.github/workflows/ms.web.staticsites.yml @@ -106,8 +106,7 @@ jobs: - name: 'Using test file [${{ matrix.moduleTestFilePaths }}]' uses: ./.github/actions/templates/validateModuleDeployment with: - templateFilePath: '${{ env.modulePath }}/deploy.bicep' - parameterFilePath: '${{ env.modulePath }}/${{ matrix.moduleTestFilePaths }}' + templateFilePath: '${{ env.modulePath }}/${{ matrix.moduleTestFilePaths }}' location: '${{ env.location }}' resourceGroupName: '${{ env.resourceGroupName }}' subscriptionId: '${{ secrets.ARM_SUBSCRIPTION_ID }}' diff --git a/modules/Microsoft.Web/staticSites/.test/default/dependencies.bicep b/modules/Microsoft.Web/staticSites/.test/default/dependencies.bicep new file mode 100644 index 0000000000..3468ceb379 --- /dev/null +++ b/modules/Microsoft.Web/staticSites/.test/default/dependencies.bicep @@ -0,0 +1,42 @@ +@description('Optional. The location to deploy to.') +param location string = resourceGroup().location + +@description('Required. The name of the Virtual Network to create.') +param virtualNetworkName string + +@description('Required. The name of the Managed Identity to create.') +param managedIdentityName string + +resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { + name: virtualNetworkName + location: location + properties: { + addressSpace: { + addressPrefixes: [ + '10.0.0.0/24' + ] + } + subnets: [ + { + name: 'defaultSubnet' + properties: { + addressPrefix: '10.0.0.0/24' + } + } + ] + } +} + +resource managedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2018-11-30' = { + name: managedIdentityName + location: location +} + +@description('The resource ID of the created Virtual Network Subnet.') +output subnetResourceId string = virtualNetwork.properties.subnets[0].id + +@description('The principal ID of the created Managed Identity.') +output managedIdentityPrincipalId string = managedIdentity.properties.principalId + +@description('The resource ID of the created Managed Identity.') +output managedIdentityResourceId string = managedIdentity.id diff --git a/modules/Microsoft.Web/staticSites/.test/default/deploy.test.bicep b/modules/Microsoft.Web/staticSites/.test/default/deploy.test.bicep new file mode 100644 index 0000000000..8da50df5a5 --- /dev/null +++ b/modules/Microsoft.Web/staticSites/.test/default/deploy.test.bicep @@ -0,0 +1,69 @@ +targetScope = 'subscription' + +// ========== // +// Parameters // +// ========== // +@description('Optional. The name of the resource group to deploy for a testing purposes') +@maxLength(90) +param resourceGroupName string = 'ms.web.staticsites-${serviceShort}-rg' + +@description('Optional. The location to deploy resources to') +param location string = deployment().location + +@description('Optional. A short identifier for the kind of deployment .Should be kept short to not run into resource-name length-constraints') +param serviceShort string = 'wssdef' + +// =========== // +// Deployments // +// =========== // + +// General resources +// ================= +resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { + name: resourceGroupName + location: location +} + +module resourceGroupResources 'dependencies.bicep' = { + scope: resourceGroup + name: '${uniqueString(deployment().name, location)}-paramNested' + params: { + virtualNetworkName: 'dep-<>-vnet-${serviceShort}' + managedIdentityName: 'dep-<>-msi-${serviceShort}' + } +} + +// ============== // +// Test Execution // +// ============== // + +module testDeployment '../../deploy.bicep' = { + scope: resourceGroup + name: '${uniqueString(deployment().name)}-test-${serviceShort}' + params: { + name: '<>${serviceShort}001' + allowConfigFileUpdates: true + enterpriseGradeCdnStatus: 'Disabled' + lock: 'CanNotDelete' + privateEndpoints: [ + { + service: 'staticSites' + subnetResourceId: resourceGroupResources.outputs.subnetResourceId + } + ] + roleAssignments: [ + { + principalIds: [ + resourceGroupResources.outputs.managedIdentityPrincipalId + ] + roleDefinitionIdOrName: 'Reader' + } + ] + sku: 'Standard' + stagingEnvironmentPolicy: 'Enabled' + systemAssignedIdentity: true + userAssignedIdentities: { + '${resourceGroupResources.outputs.managedIdentityResourceId}': {} + } + } +} diff --git a/modules/Microsoft.Web/staticSites/.test/min.parameters.json b/modules/Microsoft.Web/staticSites/.test/min.parameters.json deleted file mode 100644 index b5781f46f0..0000000000 --- a/modules/Microsoft.Web/staticSites/.test/min.parameters.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", - "contentVersion": "1.0.0.0", - "parameters": { - "name": { - "value": "<>-az-wss-min-001" - } - } -} diff --git a/modules/Microsoft.Web/staticSites/.test/min/deploy.test.bicep b/modules/Microsoft.Web/staticSites/.test/min/deploy.test.bicep new file mode 100644 index 0000000000..685d7a5172 --- /dev/null +++ b/modules/Microsoft.Web/staticSites/.test/min/deploy.test.bicep @@ -0,0 +1,37 @@ +targetScope = 'subscription' + +// ========== // +// Parameters // +// ========== // +@description('Optional. The name of the resource group to deploy for a testing purposes') +@maxLength(90) +param resourceGroupName string = 'ms.web.staticsites-${serviceShort}-rg' + +@description('Optional. The location to deploy resources to') +param location string = deployment().location + +@description('Optional. A short identifier for the kind of deployment .Should be kept short to not run into resource-name length-constraints') +param serviceShort string = 'wssmin' + +// =========== // +// Deployments // +// =========== // + +// General resources +// ================= +resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { + name: resourceGroupName + location: location +} + +// ============== // +// Test Execution // +// ============== // + +module testDeployment '../../deploy.bicep' = { + scope: resourceGroup + name: '${uniqueString(deployment().name)}-test-${serviceShort}' + params: { + name: '<>${serviceShort}001' + } +} diff --git a/modules/Microsoft.Web/staticSites/.test/parameters.json b/modules/Microsoft.Web/staticSites/.test/parameters.json deleted file mode 100644 index 68d8697715..0000000000 --- a/modules/Microsoft.Web/staticSites/.test/parameters.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", - "contentVersion": "1.0.0.0", - "parameters": { - "name": { - "value": "<>-az-wss-x-001" - }, - "lock": { - "value": "CanNotDelete" - }, - "sku": { - "value": "Standard" - }, - "stagingEnvironmentPolicy": { - "value": "Enabled" - }, - "allowConfigFileUpdates": { - "value": true - }, - "enterpriseGradeCdnStatus": { - "value": "Disabled" - }, - "systemAssignedIdentity": { - "value": true - }, - "userAssignedIdentities": { - "value": { - "/subscriptions/<>/resourcegroups/validation-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/adp-<>-az-msi-x-001": {} - } - }, - "roleAssignments": { - "value": [ - { - "roleDefinitionIdOrName": "Reader", - "principalIds": [ - "<>" - ] - } - ] - }, - "privateEndpoints": { - "value": [ - { - "subnetResourceId": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<>-az-vnet-x-001/subnets/<>-az-subnet-x-005-privateEndpoints", - "service": "staticSites" - } - ] - } - } -} From 7da5cf19d011cb2f7c9a71c422667c98ffcb21f7 Mon Sep 17 00:00:00 2001 From: MrMCake Date: Mon, 5 Sep 2022 17:38:27 +0200 Subject: [PATCH 2/8] Updated readme --- modules/Microsoft.Web/staticSites/readme.md | 94 ++++++++++----------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/modules/Microsoft.Web/staticSites/readme.md b/modules/Microsoft.Web/staticSites/readme.md index 5c15b19611..f1f00ca758 100644 --- a/modules/Microsoft.Web/staticSites/readme.md +++ b/modules/Microsoft.Web/staticSites/readme.md @@ -289,7 +289,7 @@ The following module usage examples are retrieved from the content of the files >**Note**: The name of each example is based on the name of the file from which it is taken. >**Note**: Each example lists all the required parameters first, followed by the rest - each in alphabetical order. -

Example 1: Min

+

Example 1: Default

@@ -297,47 +297,10 @@ The following module usage examples are retrieved from the content of the files ```bicep module staticSites './Microsoft.Web/staticSites/deploy.bicep' = { - name: '${uniqueString(deployment().name)}-StaticSites' - params: { - name: '<>-az-wss-min-001' - } -} -``` - -
-

- -

- -via JSON Parameter file - -```json -{ - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", - "contentVersion": "1.0.0.0", - "parameters": { - "name": { - "value": "<>-az-wss-min-001" - } - } -} -``` - -
-

- -

Example 2: Parameters

- -
- -via Bicep module - -```bicep -module staticSites './Microsoft.Web/staticSites/deploy.bicep' = { - name: '${uniqueString(deployment().name)}-StaticSites' + name: '${uniqueString(deployment().name)}-test-wssdef' params: { // Required parameters - name: '<>-az-wss-x-001' + name: '<>wssdef001' // Non-required parameters allowConfigFileUpdates: true enterpriseGradeCdnStatus: 'Disabled' @@ -345,13 +308,13 @@ module staticSites './Microsoft.Web/staticSites/deploy.bicep' = { privateEndpoints: [ { service: 'staticSites' - subnetResourceId: '/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<>-az-vnet-x-001/subnets/<>-az-subnet-x-005-privateEndpoints' + subnetResourceId: '' } ] roleAssignments: [ { principalIds: [ - '<>' + '' ] roleDefinitionIdOrName: 'Reader' } @@ -360,7 +323,7 @@ module staticSites './Microsoft.Web/staticSites/deploy.bicep' = { stagingEnvironmentPolicy: 'Enabled' systemAssignedIdentity: true userAssignedIdentities: { - '/subscriptions/<>/resourcegroups/validation-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/adp-<>-az-msi-x-001': {} + '': {} } } } @@ -380,7 +343,7 @@ module staticSites './Microsoft.Web/staticSites/deploy.bicep' = { "parameters": { // Required parameters "name": { - "value": "<>-az-wss-x-001" + "value": "<>wssdef001" }, // Non-required parameters "allowConfigFileUpdates": { @@ -396,7 +359,7 @@ module staticSites './Microsoft.Web/staticSites/deploy.bicep' = { "value": [ { "service": "staticSites", - "subnetResourceId": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<>-az-vnet-x-001/subnets/<>-az-subnet-x-005-privateEndpoints" + "subnetResourceId": "" } ] }, @@ -404,7 +367,7 @@ module staticSites './Microsoft.Web/staticSites/deploy.bicep' = { "value": [ { "principalIds": [ - "<>" + "" ], "roleDefinitionIdOrName": "Reader" } @@ -421,7 +384,7 @@ module staticSites './Microsoft.Web/staticSites/deploy.bicep' = { }, "userAssignedIdentities": { "value": { - "/subscriptions/<>/resourcegroups/validation-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/adp-<>-az-msi-x-001": {} + "": {} } } } @@ -430,3 +393,40 @@ module staticSites './Microsoft.Web/staticSites/deploy.bicep' = {

+ +

Example 2: Min

+ +
+ +via Bicep module + +```bicep +module staticSites './Microsoft.Web/staticSites/deploy.bicep' = { + name: '${uniqueString(deployment().name)}-test-wssmin' + params: { + name: '<>wssmin001' + } +} +``` + +
+

+ +

+ +via JSON Parameter file + +```json +{ + "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", + "contentVersion": "1.0.0.0", + "parameters": { + "name": { + "value": "<>wssmin001" + } + } +} +``` + +
+

From d0129aedc73da4118905a3ff3017989cadac1c28 Mon Sep 17 00:00:00 2001 From: MrMCake Date: Thu, 8 Sep 2022 19:19:21 +0200 Subject: [PATCH 3/8] Updated folder default to common. --- .../staticSites/.test/{default => common}/dependencies.bicep | 0 .../staticSites/.test/{default => common}/deploy.test.bicep | 0 modules/Microsoft.Web/staticSites/readme.md | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) rename modules/Microsoft.Web/staticSites/.test/{default => common}/dependencies.bicep (100%) rename modules/Microsoft.Web/staticSites/.test/{default => common}/deploy.test.bicep (100%) diff --git a/modules/Microsoft.Web/staticSites/.test/default/dependencies.bicep b/modules/Microsoft.Web/staticSites/.test/common/dependencies.bicep similarity index 100% rename from modules/Microsoft.Web/staticSites/.test/default/dependencies.bicep rename to modules/Microsoft.Web/staticSites/.test/common/dependencies.bicep diff --git a/modules/Microsoft.Web/staticSites/.test/default/deploy.test.bicep b/modules/Microsoft.Web/staticSites/.test/common/deploy.test.bicep similarity index 100% rename from modules/Microsoft.Web/staticSites/.test/default/deploy.test.bicep rename to modules/Microsoft.Web/staticSites/.test/common/deploy.test.bicep diff --git a/modules/Microsoft.Web/staticSites/readme.md b/modules/Microsoft.Web/staticSites/readme.md index f1f00ca758..9c081bf3e4 100644 --- a/modules/Microsoft.Web/staticSites/readme.md +++ b/modules/Microsoft.Web/staticSites/readme.md @@ -289,7 +289,7 @@ The following module usage examples are retrieved from the content of the files >**Note**: The name of each example is based on the name of the file from which it is taken. >**Note**: Each example lists all the required parameters first, followed by the rest - each in alphabetical order. -

Example 1: Default

+

Example 1: Common

From 59c13a2e336381e7369a105c4e0ff932664ba2b6 Mon Sep 17 00:00:00 2001 From: MrMCake Date: Fri, 9 Sep 2022 12:52:34 +0200 Subject: [PATCH 4/8] Update to latest --- .../Microsoft.Web/staticSites/.test/common/deploy.test.bicep | 4 ++-- modules/Microsoft.Web/staticSites/.test/min/deploy.test.bicep | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/Microsoft.Web/staticSites/.test/common/deploy.test.bicep b/modules/Microsoft.Web/staticSites/.test/common/deploy.test.bicep index 8da50df5a5..f4d92504c3 100644 --- a/modules/Microsoft.Web/staticSites/.test/common/deploy.test.bicep +++ b/modules/Microsoft.Web/staticSites/.test/common/deploy.test.bicep @@ -10,8 +10,8 @@ param resourceGroupName string = 'ms.web.staticsites-${serviceShort}-rg' @description('Optional. The location to deploy resources to') param location string = deployment().location -@description('Optional. A short identifier for the kind of deployment .Should be kept short to not run into resource-name length-constraints') -param serviceShort string = 'wssdef' +@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints') +param serviceShort string = 'wsscom' // =========== // // Deployments // diff --git a/modules/Microsoft.Web/staticSites/.test/min/deploy.test.bicep b/modules/Microsoft.Web/staticSites/.test/min/deploy.test.bicep index 685d7a5172..ad6fdf9cbe 100644 --- a/modules/Microsoft.Web/staticSites/.test/min/deploy.test.bicep +++ b/modules/Microsoft.Web/staticSites/.test/min/deploy.test.bicep @@ -10,7 +10,7 @@ param resourceGroupName string = 'ms.web.staticsites-${serviceShort}-rg' @description('Optional. The location to deploy resources to') param location string = deployment().location -@description('Optional. A short identifier for the kind of deployment .Should be kept short to not run into resource-name length-constraints') +@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints') param serviceShort string = 'wssmin' // =========== // From f531641e9e84887b2a4c987ebbdf0174cc7130cb Mon Sep 17 00:00:00 2001 From: MrMCake Date: Fri, 9 Sep 2022 13:05:52 +0200 Subject: [PATCH 5/8] Update to latest --- .../staticSites/.test/common/deploy.test.bicep | 6 +++--- .../Microsoft.Web/staticSites/.test/min/deploy.test.bicep | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/Microsoft.Web/staticSites/.test/common/deploy.test.bicep b/modules/Microsoft.Web/staticSites/.test/common/deploy.test.bicep index f4d92504c3..da12e55b17 100644 --- a/modules/Microsoft.Web/staticSites/.test/common/deploy.test.bicep +++ b/modules/Microsoft.Web/staticSites/.test/common/deploy.test.bicep @@ -3,14 +3,14 @@ targetScope = 'subscription' // ========== // // Parameters // // ========== // -@description('Optional. The name of the resource group to deploy for a testing purposes') +@description('Optional. The name of the resource group to deploy for a testing purposes.') @maxLength(90) param resourceGroupName string = 'ms.web.staticsites-${serviceShort}-rg' -@description('Optional. The location to deploy resources to') +@description('Optional. The location to deploy resources to.') param location string = deployment().location -@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints') +@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.') param serviceShort string = 'wsscom' // =========== // diff --git a/modules/Microsoft.Web/staticSites/.test/min/deploy.test.bicep b/modules/Microsoft.Web/staticSites/.test/min/deploy.test.bicep index ad6fdf9cbe..9b851315b3 100644 --- a/modules/Microsoft.Web/staticSites/.test/min/deploy.test.bicep +++ b/modules/Microsoft.Web/staticSites/.test/min/deploy.test.bicep @@ -3,14 +3,14 @@ targetScope = 'subscription' // ========== // // Parameters // // ========== // -@description('Optional. The name of the resource group to deploy for a testing purposes') +@description('Optional. The name of the resource group to deploy for a testing purposes.') @maxLength(90) param resourceGroupName string = 'ms.web.staticsites-${serviceShort}-rg' -@description('Optional. The location to deploy resources to') +@description('Optional. The location to deploy resources to.') param location string = deployment().location -@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints') +@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.') param serviceShort string = 'wssmin' // =========== // From 35845ba9199dd7959f28ebf9b4fa73f8aa3f3b13 Mon Sep 17 00:00:00 2001 From: MrMCake Date: Fri, 9 Sep 2022 14:17:37 +0200 Subject: [PATCH 6/8] Update to latest --- modules/Microsoft.Web/staticSites/readme.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/Microsoft.Web/staticSites/readme.md b/modules/Microsoft.Web/staticSites/readme.md index d93e49ddfd..1201ed909b 100644 --- a/modules/Microsoft.Web/staticSites/readme.md +++ b/modules/Microsoft.Web/staticSites/readme.md @@ -298,10 +298,10 @@ The following module usage examples are retrieved from the content of the files ```bicep module staticSites './Microsoft.Web/staticSites/deploy.bicep' = { - name: '${uniqueString(deployment().name)}-test-wssdef' + name: '${uniqueString(deployment().name)}-test-wsscom' params: { // Required parameters - name: '<>wssdef001' + name: '<>wsscom001' // Non-required parameters allowConfigFileUpdates: true enterpriseGradeCdnStatus: 'Disabled' @@ -344,7 +344,7 @@ module staticSites './Microsoft.Web/staticSites/deploy.bicep' = { "parameters": { // Required parameters "name": { - "value": "<>wssdef001" + "value": "<>wsscom001" }, // Non-required parameters "allowConfigFileUpdates": { From 10d213728b7b1c5c72e42b9135685eef3bb7879f Mon Sep 17 00:00:00 2001 From: Alexander Sehr Date: Sun, 18 Sep 2022 23:54:59 +0200 Subject: [PATCH 7/8] Update modules/Microsoft.Web/staticSites/.test/common/deploy.test.bicep --- .../Microsoft.Web/staticSites/.test/common/deploy.test.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.Web/staticSites/.test/common/deploy.test.bicep b/modules/Microsoft.Web/staticSites/.test/common/deploy.test.bicep index da12e55b17..fceb76fa5d 100644 --- a/modules/Microsoft.Web/staticSites/.test/common/deploy.test.bicep +++ b/modules/Microsoft.Web/staticSites/.test/common/deploy.test.bicep @@ -3,7 +3,7 @@ targetScope = 'subscription' // ========== // // Parameters // // ========== // -@description('Optional. The name of the resource group to deploy for a testing purposes.') +@description('Optional. The name of the resource group to deploy for testing purposes.') @maxLength(90) param resourceGroupName string = 'ms.web.staticsites-${serviceShort}-rg' From b3e221a72051afcb14c27d5f1e18a5fca8059890 Mon Sep 17 00:00:00 2001 From: Alexander Sehr Date: Sun, 18 Sep 2022 23:55:25 +0200 Subject: [PATCH 8/8] Update modules/Microsoft.Web/staticSites/.test/min/deploy.test.bicep --- modules/Microsoft.Web/staticSites/.test/min/deploy.test.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.Web/staticSites/.test/min/deploy.test.bicep b/modules/Microsoft.Web/staticSites/.test/min/deploy.test.bicep index 9b851315b3..7766cc80b2 100644 --- a/modules/Microsoft.Web/staticSites/.test/min/deploy.test.bicep +++ b/modules/Microsoft.Web/staticSites/.test/min/deploy.test.bicep @@ -3,7 +3,7 @@ targetScope = 'subscription' // ========== // // Parameters // // ========== // -@description('Optional. The name of the resource group to deploy for a testing purposes.') +@description('Optional. The name of the resource group to deploy for testing purposes.') @maxLength(90) param resourceGroupName string = 'ms.web.staticsites-${serviceShort}-rg'