Skip to content

Support tagging resources in single node, admin and cluster offer #327

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 19 commits into from
Sep 18, 2024

Conversation

galiacheng
Copy link
Contributor

This pull request includes several updates to the GitHub workflows, version upgrades in the pom.xml file, and enhancements for resource tagging in Azure templates. The most important changes include updating the download-artifact action version, upgrading WebLogic versions, adding resource identifiers for Azure tagging, and providing guidance on applying tags in solution templates.

Workflow and Action Updates:

  • Updated download-artifact action from v1 to v4 in multiple GitHub workflow files to ensure compatibility and leverage new features. (.github/workflows/testWlsAksWithDependencyCreation.yml, .github/workflows/testWlsAksWithoutDependencyCreation.yml, .github/workflows/testWlsVmAdmin.yml, .github/workflows/testWlsVmCluster.yml, .github/workflows/testWlsVmDynamicCluster.yml) [1] [2] [3] [4] [5] [6] [7] [8] [9] [10] [11]

Version Upgrades:

  • Upgraded WebLogic versions in the pom.xml file to the latest releases for improved performance and security. (pom.xml)

Resource Tagging Enhancements:

  • Added multiple resource identifiers in azure-common.properties to support filtering tags for various Azure resources. (resources/azure-common.properties)
  • Introduced a new section in createUiDefinition.json for tagging resources and updated the main template to handle these tags. (weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/createUiDefinition.json, weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/mainTemplate.json) [1] [2] [3] [4] [5]

Documentation:

  • Added a new guidance document for applying tags in solution templates, providing detailed steps for auditing resources, updating templates, and testing. (resources/doc/guidance-for-tagging-resource.md)

@oracle-contributor-agreement oracle-contributor-agreement bot added the OCA Verified All contributors have signed the Oracle Contributor Agreement. label Sep 14, 2024
modified:   resources/doc/guidance-for-tagging-resource.md

Signed-off-by: Ed Burns <edburns@microsoft.com>
modified:   resources/doc/guidance-for-tagging-resource.md

Signed-off-by: Ed Burns <edburns@microsoft.com>
… resource type identifiers are filtered.

modified:   resources/azure-common.properties

Signed-off-by: Ed Burns <edburns@microsoft.com>
identifier.vaults=Microsoft.KeyVault/vaults
identifier.virtualNetworks=Microsoft.Network/virtualNetworks
identifier.virtualMachines=Microsoft.Compute/virtualMachines
identifier.virtualMachinesExtensions=Virtual machine extension
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I want to know why this one is a human readable value "Virtual machine extension" while the others are resource type identifiers.

Copy link
Contributor Author

@galiacheng galiacheng Sep 18, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hello @edburns path of the two resources are not recognized by the Tag control, and I want to allow the customer to provide specified tag for them. The VM deployment from portal has similar experience.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So is this a bug in Azure, @galiacheng ?

identifier.virtualMachinesExtensions=Virtual machine extension
identifier.deploymentScripts=Microsoft.Resources/deploymentScripts
identifier.userAssignedIdentities=Microsoft.ManagedIdentity/userAssignedIdentities
identifier.resourcesDeployment=Microsoft resources deployment
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I want to know why this one is a human readable value "Microsoft resources deployment" while the others are resource type identifiers.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

modified:   weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/mainTemplate.json
modified:   weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/mainTemplate.json
modified:   weblogic-azure-vm/arm-oraclelinux-wls/src/main/arm/mainTemplate.json

Signed-off-by: Ed Burns <edburns@microsoft.com>
…lace.

modified:   resources/azure-common.properties
modified:   weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/mainTemplate.json
modified:   weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_dbTemplate.json
modified:   weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_dnszones/_createDNSZonesTemplate.json
modified:   weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_dnszones/_uamiAndRoleAssignment.json
modified:   weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_dnszones/_updateDNSZonesTemplate.json
modified:   weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_installJdbcLibsTemplate.json
modified:   weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_keyVaultNestedTemplate.json
modified:   weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/_pswlessDbTemplate.json
modified:   weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/aadNestedTemplate.json
modified:   weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/adminTemplate.json
modified:   weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/adminTemplateForCustomSSL.json
modified:   weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/dbTemplate.json
modified:   weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/dnszonesTemplate.json
modified:   weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/elkNestedTemplate.json
modified:   weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/mainTemplate.json
modified:   weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_dbTemplate.json
modified:   weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_dnszones/_createDNSZonesTemplate.json
modified:   weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_dnszones/_uamiAndRoleAssignment.json
modified:   weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_dnszones/_updateDNSZonesTemplate.json
modified:   weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_installJdbcLibsTemplate.json
modified:   weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_keyvault/_keyvaultWithExistingCertTemplate.json
modified:   weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_keyvault/_keyvaultWithNewCertTemplate.json
modified:   weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_keyvaultAdapterTemplate.json
modified:   weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_keyvaultAppGatewayConnectorTemplate.json
modified:   weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_keyvaultSSLConfigTemplate.json
modified:   weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/_pswlessDbTemplate.json
modified:   weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/aadNestedTemplate.json
modified:   weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/appGatewayNestedTemplate.json
modified:   weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/clusterCustomSSLTemplate.json
modified:   weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/clusterTemplate.json
modified:   weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/coherenceTemplate.json
modified:   weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/dbTemplate.json
modified:   weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/dnszonesTemplate.json
modified:   weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/elkNestedTemplate.json
modified:   weblogic-azure-vm/arm-oraclelinux-wls/src/main/arm/mainTemplate.json

Signed-off-by: Ed Burns <edburns@microsoft.com>
Copy link
Contributor

@edburns edburns left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See comments like, "I want to know why this one is a human readable
value "..." while the others are resource type identifiers.". If these
two human readable values can be replaced by their corresponding
resource type identifier values, please do that. Otherwise, I suggest
the property name reflect how they differ from the rest of the similar
property names. For example, perhaps they should be
label.virtualMachinesExtensions or
identifier.label_virtualMachinesExtensions.

I am very confident you have a reason for this, but I seek to
understand it.

@galiacheng
Copy link
Contributor Author

See comments like, "I want to know why this one is a human readable value "

Good catch, please see #327 (comment).

@rjeberhard rjeberhard merged commit 73b9519 into oracle:main Sep 18, 2024
2 checks passed
@galiacheng galiacheng deleted the tags-for-resources branch October 17, 2024 05:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
OCA Verified All contributors have signed the Oracle Contributor Agreement.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants