Skip to content

Fix bugs found in the E2E test. #24

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 20 commits into from
Sep 24, 2021
Merged

Fix bugs found in the E2E test. #24

merged 20 commits into from
Sep 24, 2021

Conversation

galiacheng
Copy link
Contributor

@galiacheng galiacheng commented Sep 24, 2021 •
edited
Loading

This pr is for bug fixed which were found during the e2e test by the test vendors.

Changes:

UI

  • OSSO account password should not include semicolon.
  • make nodeVM size number is the same with node count.
  • fix regex of managed server prefix.
  • enhance Lb editable grid with regex on service name prefix and port, no support on duplicated service prefix and duplicated targets.
  • fix regex of app gateway frontend password.
  • fix regex for "contains letters, numbers and hyphens (-), must begin with a letter, end with a letter or digit, and not contain consecutive hyphens".
  • fix regex for db user name.
  • enhance tooltip of DNS Zone name control.
  • allow underscores (_), periods (.) and hyphens in jndi name.

Output

  • remove /console/ from the remote console url.
  • output secured urls exposed by Lb service.

Scripts

  • fix regression issue in post deployment introduced by t3 tunneling.
  • fix issue - fail to create multiple domains in the sample cluster with SSL enabled.
  • wait for ingress completed.
  • support .jar package.

@galiacheng
On branch e2etest: OSSO account password should not include semicolon.
6a33183 
Signed-off-by: galiacheng <haixia.cheng@microsoft.com>

 Changes to be committed:
	modified:   src/main/arm/createUiDefinition.json
@galiacheng
On branch e2etest: remove '/console/' from the remote console url.
7a5ba78 
Signed-off-by: galiacheng <haixia.cheng@microsoft.com>

 Changes to be committed:
	modified:   weblogic-azure-aks/src/main/bicep/modules/networking.bicep
@galiacheng
On branch e2etest: remove slash from cluster endpoint.
11b4b5b 
Signed-off-by: galiacheng <haixia.cheng@microsoft.com>

 Changes to be committed:
	modified:   weblogic-azure-aks/src/main/arm/scripts/createLbSvc.sh
@galiacheng
On branch e2etest: fix regression issue in post deployment introduced…
f73c5a2 
… by t3 tunneling

Signed-off-by: galiacheng <haixia.cheng@microsoft.com>

Changes to be committed:
	modified:   weblogic-azure-aks/src/main/arm/scripts/updateApplications.sh
@galiacheng
On branch e2etest: fix issue - fail to create multiple domains in the…
8a02312 
… sample cluster with SSL enabled.

Query storage account name from one of existing pv label

Signed-off-by: galiacheng <haixia.cheng@microsoft.com>

 Changes to be committed:
	modified:   weblogic-azure-aks/src/main/arm/scripts/queryStorageAccount.sh
	modified:   weblogic-azure-aks/src/main/bicep/mainTemplate.bicep
	modified:   weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-query-storage-account.bicep
@galiacheng
On branch e2etest: wait for ingress completed.
6cd35f7 
Signed-off-by: galiacheng <haixia.cheng@microsoft.com>

 Changes to be committed:
	modified:   weblogic-azure-aks/src/main/arm/scripts/createAppGatewayIngress.sh
	modified:   weblogic-azure-aks/src/main/arm/scripts/utility.sh
@galiacheng
On branch e2etest: UI fix: make nodeVM size number is the same with n…
8869d6b 
…ode count.

 Changes to be committed:
	modified:   ../../src/main/arm/createUiDefinition.json
@galiacheng
On branch e2etest: fix regex of managed server prefix.
519ce5d 
The prefix must be between 3 and 20 characters long and contain letters, numbers and hyphens(-). The name must begin with a letter, end with a letter or digit, and not contain consecutive hyphens.

 Changes to be committed:
	modified:   weblogic-azure-aks/src/main/arm/createUiDefinition.json

Signed-off-by: galiacheng <haixia.cheng@microsoft.com>
@galiacheng
On branch e2etest: enhance Lb editable grid with regex on service nam…
70d4168 
…e prefix and port, no support on duplicated service prefix and duplicated targets.

Signed-off-by: galiacheng <haixia.cheng@microsoft.com>

Changes to be committed:
	modified:   weblogic-azure-aks/src/main/arm/createUiDefinition.json
@galiacheng
On branch e2etest: fix regex of app gateway frontend password.
d90f841 
The password must contain at least 6 characters, with at least 1 uppercase letter, 1 lowercase letter and 1 number.

Signed-off-by: galiacheng <haixia.cheng@microsoft.com>

 Changes to be committed:
	modified:   weblogic-azure-aks/src/main/arm/createUiDefinition.json
@galiacheng
On branch e2etest: fix regex for "contains letters, numbers and hyphe…
89550ab 
…ns (-), must begin with a letter, end with a letter or digit, and not contain consecutive hyphens."

Regex: ^(?=.{3,24}$)[a-zA-Z](?!.*--)[a-zA-Z0-9-]*[a-zA-Z0-9]$
Test case:
	Pass:
	he-g-hg-f
	hl-h12
	AIRV123
	g90-ouio-hfujhh-AjhAhj
	Failed:
	l7-$u-#5l-^-^k
	h-j--y
	1sdfdaf
	hohjjghj-
	-gfffgrgfdsf
	g90-ouio-hfujhh-AjhAhjffgadfg
	hi-^
	hi-
	hji--o

Signed-off-by: galiacheng <haixia.cheng@microsoft.com>

Changes to be committed:
	modified:   src/main/arm/createUiDefinition.json
@galiacheng
On branch e2etest: do not download unsupport files (files should end …
96ec326 
…with .war, .jar, .ear)

Signed-off-by: galiacheng <haixia.cheng@microsoft.com>

Changes to be committed:
	modified:   src/main/arm/createUiDefinition.json
	modified:   src/main/arm/scripts/genImageModel.sh
@galiacheng
On branch e2etest: fix regex for db user name.
e118289 
Regex: ^(?=.{1,128}$)[a-zA-Z](?!.*--)(?!.*@@)(?!.*-@)(?!.*@-)[a-zA-Z0-9-@]*[a-zA-Z0-9]$
Test cases:
Pass:
weblogic
weblogic@azurepostgresql
weblogic-qa
weblo12
Aweblogic13
w-e-b-l-o-g-i-c@azurepostgresql

Failed:
@weblogic
@-@
w--b
w@@b
w-@b
w@-b

Signed-off-by: galiacheng <haixia.cheng@microsoft.com>

Changes to be committed:
	modified:   src/main/arm/createUiDefinition.json
@galiacheng
On branch e2etest: enhance tooltip of DNS Zone name control.
5bfa863 
Signed-off-by: galiacheng <haixia.cheng@microsoft.com>

Changes to be committed:
	modified:   src/main/arm/createUiDefinition.json
@galiacheng
On branch e2etest: increase pom version
eaef43f 
Signed-off-by: galiacheng <haixia.cheng@microsoft.com>

Changes not staged for commit:
	modified:   src/main/bicep/mainTemplate.bicep
@galiacheng
On branch e2etest: allow underscores (_), periods (.) and hyphens in …
d21ac96 
…jndi name.

Signed-off-by: galiacheng <haixia.cheng@microsoft.com>

Changes to be committed:
	modified:   src/main/arm/createUiDefinition.json
@galiacheng
On branchc e2etest: take "." "_" "(" ")" from gateway dns name that i…
cbf3458 
…ntroduced by resource group name.

Signed-off-by: galiacheng <haixia.cheng@microsoft.com>

 Changes to be committed:
	modified:   weblogic-azure-aks/src/main/bicep/mainTemplate.bicep
	modified:   weblogic-azure-aks/src/main/bicep/modules/_azure-resoruces/_appgateway.bicep
@galiacheng
On branch e2etest: output secured urls exposed by Lb service.
2ee42f0 
Signed-off-by: galiacheng <haixia.cheng@microsoft.com>

 Changes to be committed:
	modified:   weblogic-azure-aks/src/main/arm/scripts/createLbSvc.sh
	modified:   weblogic-azure-aks/src/main/bicep/modules/_deployment-scripts/_ds-create-networking.bicep
	modified:   weblogic-azure-aks/src/main/bicep/modules/networking.bicep
@galiacheng
On branch e2etest: support updating with .jar application in post dep…
4583958 
…loyment.

Signed-off-by: galiacheng <haixia.cheng@microsoft.com>

 Changes to be committed:
	modified:   weblogic-azure-aks/src/main/arm/scripts/updateApplications.sh
	modified:   weblogic-azure-aks/src/main/bicep/modules/updateWebLogicApplications.bicep
@galiacheng galiacheng changed the title Fix bugs found in the e2e test. Fix bugs found in the E2E test. Sep 24, 2021
@galiacheng
On branch e2etest: fix lb url outputs
b6a1d8a 
Signed-off-by: galiacheng <haixia.cheng@microsoft.com>

 Changes to be committed:
	modified:   weblogic-azure-aks/src/main/bicep/modules/networking.bicep
@mriccell mriccell merged commit d74fb7d into oracle:main Sep 24, 2021
edburns pushed a commit to azure-javaee/weblogic-azure that referenced this pull request Aug 13, 2025
@galiacheng @edburns
# This is a combination of 24 commits.
ce78bdf 
# This is the 1st commit message:

single node: modify UI and template

increase pom

upgrade Microsoft.Resources/deployments API version

add toolTip for tag control.

fix artifact version

# This is the commit message #2:

admin offer: modify UI and templates

# This is the commit message #3:

guidance for tagging resource

# This is the commit message oracle#4:

fix function error in admin/mainTemplate.json

# This is the commit message oracle#5:

use aka link for maven download url

# This is the commit message oracle#6:

fix mavn installation path

# This is the commit message oracle#7:

use actions/upload-artifact: v4

# This is the commit message oracle#8:

modify UI and templates in cluster offer

# This is the commit message oracle#9:

fix tag issue in _pswlessDbTemplate.json

# This is the commit message oracle#10:

use download-artifact@v4

# This is the commit message oracle#11:

format mainTemplate.json in cluster offer

# This is the commit message oracle#12:

fix variable reference issue

# This is the commit message oracle#13:

fix template error in cluster offer

# This is the commit message oracle#14:

On branch tags-for-resources Include a little text about Tags.
modified:   resources/doc/guidance-for-tagging-resource.md

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

# This is the commit message oracle#15:

On branch tags-for-resources Reference the PR.
modified:   resources/doc/guidance-for-tagging-resource.md

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

# This is the commit message oracle#16:

On branch tags-for-resources Explain why only some occurrences of the resource type identifiers are filtered.
modified:   resources/azure-common.properties

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

# This is the commit message oracle#17:

On branch tags-for-resources Comment copy/pasted behavior.
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>

# This is the commit message oracle#18:

On branch tags-for-resources Fix DRY violation: define label in one place.
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>

# This is the commit message oracle#19:

Support tagging resource in WLS AKS offer (oracle#328)

* modify aks offer to support tag

* debug template

* specify download path

* add identifier.workspaces

* tag vm and vm extension that are created with cli

* test bicep 0.26.54

* fix empty vm tags

* fix file share name

* apply tags to agent pool

* Tag for Microsoft.Monitor/accounts

* doc for aks tag

* clean up source code for tagging resources in aks offer.

* increase pom version

* add comment for bicep user defined function.
# This is the commit message oracle#20:

modify ui definition to show the java option element (oracle#332)

increase pom
# This is the commit message oracle#21:

On branch edburns-msft-dd-2321245-empty-resource-group apply the "allowExisting" property.
modified:   pom.xml
modified:   weblogic-azure-aks/src/main/arm/createUiDefinition.json

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

# This is the commit message oracle#22:

use the properties Zhihao provided.

# This is the commit message oracle#23:

On branch edburns-msft-dd-2321245-empty-resource-group @backwind1233 pointed out the property was in the incorrect place.
modified:   pom.xml
modified:   weblogic-azure-aks/src/main/arm/createUiDefinition.json

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

# This is the commit message oracle#24:

enable deployment to non-empty resource groups
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mriccell mriccell mriccell approved these changes

@rjeberhard rjeberhard rjeberhard approved these changes

@sanjaymantoor sanjaymantoor Awaiting requested review from sanjaymantoor

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@galiacheng @mriccell @rjeberhard