Skip to content

Commit 86ecf37

Browse files
sankarpnsankarpn
authored
Fix for failing tests in altran certification exercise. (#3208)
* Fix for failing tests in altran certification exercise
1 parent 3e4af20 commit 86ecf37

File tree

4 files changed

+45
-23
lines changed

4 files changed

+45
-23
lines changed

‎integration-tests/src/test/java/oracle/weblogic/domain/Model.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,11 @@ public void setRuntimeEncryptionSecret(String runtimeEncryptionSecret) {
8686
this.runtimeEncryptionSecret = runtimeEncryptionSecret;
8787
}
8888

89-
String getModelHome() {
89+
public String getModelHome() {
9090
return modelHome;
9191
}
9292

93-
void setModelHome(String modelHome) {
93+
public void setModelHome(String modelHome) {
9494
this.modelHome = modelHome;
9595
}
9696

@@ -99,11 +99,11 @@ public Model withModelHome(String modelHome) {
9999
return this;
100100
}
101101

102-
String getWdtInstallHome() {
102+
public String getWdtInstallHome() {
103103
return wdtInstallHome;
104104
}
105105

106-
void setWdtInstallHome(String wdtInstallHome) {
106+
public void setWdtInstallHome(String wdtInstallHome) {
107107
this.wdtInstallHome = wdtInstallHome;
108108
}
109109

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItConfigDistributionStrategy.java‎

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@
115115
import static org.junit.jupiter.api.Assertions.assertNotEquals;
116116
import static org.junit.jupiter.api.Assertions.assertNotNull;
117117
import static org.junit.jupiter.api.Assertions.assertTrue;
118+
import static org.junit.jupiter.api.Assertions.fail;
118119

119120
/**
120121
* Tests related to overrideDistributionStrategy attribute.
@@ -555,8 +556,18 @@ void testOnRestartOverride() {
555556
Path dstDsOverrideFile = Paths.get(WORK_DIR, "jdbc-JdbcTestDataSource-1.xml");
556557
String tempString = assertDoesNotThrow(()
557558
-> Files.readString(srcDsOverrideFile).replaceAll("JDBC_URL", dsUrl2));
558-
assertDoesNotThrow(()
559-
-> Files.write(dstDsOverrideFile, tempString.getBytes(StandardCharsets.UTF_8)));
559+
logger.info("Before override \n{0}", tempString);
560+
if (WEBLOGIC_IMAGE_TO_USE_IN_SPEC.contains("12.2.1.3")) {
561+
logger.info("Using 12.2.1.3 image, driver is com.mysql.jdbc.Driver");
562+
tempString = tempString.replaceAll("com.mysql.cj.jdbc.Driver", "com.mysql.jdbc.Driver");
563+
}
564+
logger.info("After override \n{0}", tempString);
565+
try {
566+
Files.write(dstDsOverrideFile, tempString.getBytes(StandardCharsets.UTF_8));
567+
} catch (IOException ioe) {
568+
logger.severe(ioe.getMessage());
569+
fail("Couldn't write override file");
570+
}
560571

561572
List<Path> overrideFiles = new ArrayList<>();
562573
overrideFiles.add(dstDsOverrideFile);
@@ -1076,7 +1087,13 @@ private void createJdbcDataSource(String dsName, String user, String password,
10761087
p.setProperty("admin_password", ADMIN_PASSWORD_DEFAULT);
10771088
p.setProperty("dsName", dsName);
10781089
p.setProperty("dsUrl", jdbcDsUrl);
1079-
p.setProperty("dsDriver", "com.mysql.cj.jdbc.Driver");
1090+
if (WEBLOGIC_IMAGE_TO_USE_IN_SPEC.contains("12.2.1.3")) {
1091+
logger.info("Using 12.2.1.3 image, driver is com.mysql.jdbc.Driver");
1092+
p.setProperty("dsDriver", "com.mysql.jdbc.Driver");
1093+
} else {
1094+
logger.info("Using 12.2.1.4 and later image, driver is com.mysql.cj.jdbc.Driver");
1095+
p.setProperty("dsDriver", "com.mysql.cj.jdbc.Driver");
1096+
}
10801097
p.setProperty("dsUser", user);
10811098
p.setProperty("dsPassword", password);
10821099
p.setProperty("dsTarget", clusterName);

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiDynamicUpdatePart3.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import static oracle.weblogic.kubernetes.TestConstants.MII_DYNAMIC_UPDATE_EXPECTED_ERROR_MSG;
2727
import static oracle.weblogic.kubernetes.TestConstants.OPERATOR_RELEASE_NAME;
2828
import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_SLIM;
29-
import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_VERSION;
3029
import static oracle.weblogic.kubernetes.actions.ActionConstants.MODEL_DIR;
3130
import static oracle.weblogic.kubernetes.actions.ActionConstants.WORK_DIR;
3231
import static oracle.weblogic.kubernetes.actions.TestActions.getDomainCustomResource;
@@ -260,7 +259,7 @@ void testOperatorLogIntrospectorMsg() {
260259
logger.info("operator pod log: {0}", operatorPodLog);
261260
assertTrue(operatorPodLog.contains("Introspector Job Log"));
262261
if (!WEBLOGIC_SLIM) {
263-
assertTrue(operatorPodLog.contains("WebLogic version='" + WEBLOGIC_VERSION + "'"));
262+
assertTrue(operatorPodLog.contains("Version check passed"));
264263
}
265264
assertTrue(operatorPodLog.contains("Job " + domainUid + "-introspector has failed"));
266265
assertTrue(operatorPodLog.contains(MII_DYNAMIC_UPDATE_EXPECTED_ERROR_MSG));

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/actions/impl/Secret.java‎

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import java.util.ArrayList;
77
import java.util.Base64;
88
import java.util.List;
9+
import java.util.concurrent.TimeUnit;
910

1011
import io.kubernetes.client.openapi.ApiException;
1112
import io.kubernetes.client.openapi.models.V1ObjectReference;
@@ -20,6 +21,7 @@
2021
import static oracle.weblogic.kubernetes.actions.impl.primitive.Kubernetes.listServiceAccounts;
2122
import static oracle.weblogic.kubernetes.actions.impl.primitive.Kubernetes.readSecretByReference;
2223
import static oracle.weblogic.kubernetes.utils.ThreadSafeLogger.getLogger;
24+
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
2325

2426
public class Secret {
2527

@@ -110,34 +112,38 @@ public static String getSecretOfServiceAccount(String namespace, String serviceA
110112
* @return the encoded token of the secret
111113
*/
112114
public static String getSecretEncodedToken(String namespace, String secretName) {
115+
LoggingFacade logger = getLogger();
116+
for (int i = 0; i < 10; i++) {
117+
String token = getToken(namespace, secretName);
118+
if (token != null) {
119+
logger.info("Got the token {0}", token);
120+
return token;
121+
}
122+
logger.info("Token is null, retrying after 5 seconds");
123+
assertDoesNotThrow(() -> TimeUnit.SECONDS.sleep(5));
124+
}
125+
logger.warning("Secret token is null");
126+
return null;
127+
}
113128

129+
private static String getToken(String namespace, String secretName) {
130+
String token = null;
114131
List<V1Secret> v1Secrets = new ArrayList<>();
115-
116132
V1SecretList secretList = listSecrets(namespace);
117133
if (secretList != null) {
118134
v1Secrets = secretList.getItems();
119135
}
120-
121136
for (V1Secret v1Secret : v1Secrets) {
122137
if (v1Secret.getMetadata() != null && v1Secret.getMetadata().getName() != null) {
123138
if (v1Secret.getMetadata().getName().equals(secretName)) {
124-
if (v1Secret.getData() != null) {
139+
if (v1Secret.getData() != null && v1Secret.getData().get("token") != null) {
125140
byte[] encodedToken = v1Secret.getData().get("token");
126-
getLogger().info(new String(encodedToken));
127-
Base64.Encoder encoder = Base64.getEncoder();
128-
if (encoder != null) {
129-
String encodeToString = encoder.encodeToString(encodedToken);
130-
getLogger().info(encodeToString);
131-
} else {
132-
getLogger().info("encoder is null");
133-
}
134-
return Base64.getEncoder().encodeToString(encodedToken);
141+
token = Base64.getEncoder().encodeToString(encodedToken);
135142
}
136143
}
137144
}
138145
}
139-
140-
return "";
146+
return token;
141147
}
142148

143149
/**

0 commit comments

Comments
 (0)