Skip to content

Commit 70bfd4b

Browse files
committed
Removed failure when optional args are empty
1 parent 92e1cc8 commit 70bfd4b

File tree

2 files changed

+15
-18
lines changed

2 files changed

+15
-18
lines changed
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package app;
22

3-
import app.component.App;
43
import common.Const;
54
import common.EnabledCondition;
65
import common.EnvUtil;
@@ -10,7 +9,7 @@
109
import java.util.Set;
1110

1211
public class GitHubTestPipelineApps extends Apps {
13-
private static final String CORE_URL = EnvUtil.getEnv(Const.Config.Pipeline.CORE_URL);
12+
private static final String CORE_URL = EnvUtil.getEnv(Const.Config.Pipeline.CORE_URL, EnabledCondition.isLocal());
1413

1514
private static final String OPERATOR_URL = EnvUtil.getEnv(Const.Config.Pipeline.OPERATOR_URL);
1615
private static final Operator.Type OPERATOR_TYPE = Operator.Type.valueOf(EnvUtil.getEnv(Const.Config.Pipeline.OPERATOR_TYPE));
@@ -20,9 +19,10 @@ public class GitHubTestPipelineApps extends Apps {
2019
: "GitHub Test Pipeline - Private %s Operator".formatted(OPERATOR_CLOUD_PROVIDER.toString());
2120

2221
public GitHubTestPipelineApps() {
23-
super(Set.of(
24-
new Operator(OPERATOR_URL, OPERATOR_NAME, OPERATOR_TYPE),
25-
new Core(CORE_URL, "GitHub Test Pipeline - Core")
26-
));
22+
super(EnabledCondition.isLocal() ?
23+
Set.of(
24+
new Operator(OPERATOR_URL, OPERATOR_NAME, OPERATOR_TYPE),
25+
new Core(CORE_URL, "GitHub Test Pipeline - Core")) :
26+
Set.of(new Operator(OPERATOR_URL, OPERATOR_NAME, OPERATOR_TYPE)));
2727
}
2828
}

src/test/java/app/component/Operator.java

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,7 @@
55
import com.google.gson.JsonObject;
66
import com.uid2.client.IdentityScope;
77
import com.uid2.client.*;
8-
import common.Const;
9-
import common.EnvUtil;
10-
import common.HttpClient;
11-
import common.Mapper;
8+
import common.*;
129
import lombok.Getter;
1310
import okhttp3.Request;
1411
import okhttp3.RequestBody;
@@ -85,16 +82,16 @@ private record V2Envelope(String envelope, byte[] nonce) {
8582
public static final String CLIENT_API_SECRET_BEFORE_OPTOUT_CUTOFF = EnvUtil.getEnv(Const.Config.Operator.CLIENT_API_SECRET_BEFORE_OPTOUT_CUTOFF);
8683

8784
// Local only - Sharing
88-
public static final String CLIENT_API_KEY_SHARING_RECIPIENT = EnvUtil.getEnv(Const.Config.Operator.CLIENT_API_KEY_SHARING_RECIPIENT);
89-
public static final String CLIENT_API_SECRET_SHARING_RECIPIENT = EnvUtil.getEnv(Const.Config.Operator.CLIENT_API_SECRET_SHARING_RECIPIENT);
90-
public static final String CLIENT_API_KEY_NON_SHARING_RECIPIENT = EnvUtil.getEnv(Const.Config.Operator.CLIENT_API_KEY_NON_SHARING_RECIPIENT);
91-
public static final String CLIENT_API_SECRET_NON_SHARING_RECIPIENT = EnvUtil.getEnv(Const.Config.Operator.CLIENT_API_SECRET_NON_SHARING_RECIPIENT);
85+
public static final String CLIENT_API_KEY_SHARING_RECIPIENT = EnvUtil.getEnv(Const.Config.Operator.CLIENT_API_KEY_SHARING_RECIPIENT, EnabledCondition.isLocal());
86+
public static final String CLIENT_API_SECRET_SHARING_RECIPIENT = EnvUtil.getEnv(Const.Config.Operator.CLIENT_API_SECRET_SHARING_RECIPIENT, EnabledCondition.isLocal());
87+
public static final String CLIENT_API_KEY_NON_SHARING_RECIPIENT = EnvUtil.getEnv(Const.Config.Operator.CLIENT_API_KEY_NON_SHARING_RECIPIENT, EnabledCondition.isLocal());
88+
public static final String CLIENT_API_SECRET_NON_SHARING_RECIPIENT = EnvUtil.getEnv(Const.Config.Operator.CLIENT_API_SECRET_NON_SHARING_RECIPIENT, EnabledCondition.isLocal());
9289

9390
// Local only - CSTG
94-
public static final String CSTG_SUBSCRIPTION_ID = EnvUtil.getEnv(Const.Config.Operator.CSTG_SUBSCRIPTION_ID);
95-
public static final String CSTG_SERVER_PUBLIC_KEY = EnvUtil.getEnv(Const.Config.Operator.CSTG_SERVER_PUBLIC_KEY);
96-
public static final String CSTG_ORIGIN = EnvUtil.getEnv(Const.Config.Operator.CSTG_ORIGIN);
97-
public static final String CSTG_INVALID_ORIGIN = EnvUtil.getEnv(Const.Config.Operator.CSTG_INVALID_ORIGIN);
91+
public static final String CSTG_SUBSCRIPTION_ID = EnvUtil.getEnv(Const.Config.Operator.CSTG_SUBSCRIPTION_ID, EnabledCondition.isLocal());
92+
public static final String CSTG_SERVER_PUBLIC_KEY = EnvUtil.getEnv(Const.Config.Operator.CSTG_SERVER_PUBLIC_KEY, EnabledCondition.isLocal());
93+
public static final String CSTG_ORIGIN = EnvUtil.getEnv(Const.Config.Operator.CSTG_ORIGIN, EnabledCondition.isLocal());
94+
public static final String CSTG_INVALID_ORIGIN = EnvUtil.getEnv(Const.Config.Operator.CSTG_INVALID_ORIGIN, EnabledCondition.isLocal());
9895

9996
@Getter
10097
private final Type type;

0 commit comments

Comments
 (0)