From aa63916831ac9c0f0e8a979c5f8ab2e9052c24fa Mon Sep 17 00:00:00 2001 From: Robert Patrick Date: Wed, 26 Jan 2022 15:18:10 -0600 Subject: [PATCH 1/2] adding quotes around deletes in WDT models for WDT 2.0 --- .../wdt-models/model.delete.sysresources.yaml | 12 ++++++------ .../wdt-models/multi-model-delete-one-ds.20.yaml | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/integration-tests/src/test/resources/wdt-models/model.delete.sysresources.yaml b/integration-tests/src/test/resources/wdt-models/model.delete.sysresources.yaml index 7a6176428da..e03223b5d86 100644 --- a/integration-tests/src/test/resources/wdt-models/model.delete.sysresources.yaml +++ b/integration-tests/src/test/resources/wdt-models/model.delete.sysresources.yaml @@ -1,15 +1,15 @@ -# Copyright (c) 2020, 2021, Oracle and/or its affiliates. +# Copyright (c) 2020, 2022, Oracle and/or its affiliates. # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. resources: FileStore: - !TestClusterFileStore: + '!TestClusterFileStore': JMSServer: - !TestClusterJmsServer: + '!TestClusterJmsServer': JMSSystemResource: - !TestClusterJmsModule: + '!TestClusterJmsModule': JDBCSystemResource: - !TestDataSource: + '!TestDataSource': appDeployments: Application: - !myear: + '!myear': diff --git a/integration-tests/src/test/resources/wdt-models/multi-model-delete-one-ds.20.yaml b/integration-tests/src/test/resources/wdt-models/multi-model-delete-one-ds.20.yaml index c2fa5d2483f..a0f0529d0c0 100644 --- a/integration-tests/src/test/resources/wdt-models/multi-model-delete-one-ds.20.yaml +++ b/integration-tests/src/test/resources/wdt-models/multi-model-delete-one-ds.20.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2020, 2021, Oracle and/or its affiliates. +# Copyright (c) 2020, 2022, Oracle and/or its affiliates. # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. resources: JDBCSystemResource: @@ -20,4 +20,4 @@ resources: Properties: user: Value: j2ee - !TestDataSource2: + '!TestDataSource2': From 93bb73487acfed88305ce43811c1410bf79b2b13 Mon Sep 17 00:00:00 2001 From: Robert Patrick Date: Wed, 26 Jan 2022 16:30:34 -0600 Subject: [PATCH 2/2] fixing deleteds model --- .../java/oracle/weblogic/kubernetes/ItMiiDynamicUpdate.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiDynamicUpdate.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiDynamicUpdate.java index 2b8cdec25e6..f33dbaba2d7 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiDynamicUpdate.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiDynamicUpdate.java @@ -680,7 +680,7 @@ void testMiiDeleteDatasource() { Path pathToDeleteDSYaml = Paths.get(WORK_DIR + "/deleteds.yaml"); String yamlToDeleteDS = "resources:\n" + " JDBCSystemResource:\n" - + " !TestDataSource2:"; + + " '!TestDataSource2':"; assertDoesNotThrow(() -> Files.write(pathToDeleteDSYaml, yamlToDeleteDS.getBytes()));