Skip to content

Commit 4ab1b20

Browse files
committed
Remove --profile from cli
Signed-off-by: Marvin Froeder <[email protected]>
1 parent 7dc4421 commit 4ab1b20

File tree

4 files changed

+1
-27
lines changed

4 files changed

+1
-27
lines changed

sqrl-testing/sqrl-integration-tests/src/test/java/com/datasqrl/AbstractAssetSnapshotTest.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,9 @@ protected AssertStatusHook execute(Path rootDir, String... args) {
118118

119119
protected AssertStatusHook execute(Path rootDir, List<String> argsList) {
120120
this.buildDir = rootDir.resolve("build");
121-
argsList.add("--profile");
122-
argsList.add(getProjectRoot().resolve("profiles/default").toString());
123121
AssertStatusHook statusHook = new AssertStatusHook();
124122
int code = new RootCommand(rootDir,statusHook).getCmd().execute(argsList.toArray(String[]::new));
125-
if (statusHook.isSuccess()) Assertions.assertEquals(0, code);
123+
if (statusHook.isSuccess() && code != 0) Assertions.assertEquals(0, code);
126124
return statusHook;
127125
}
128126

sqrl-testing/sqrl-integration-tests/src/test/java/com/datasqrl/SqrlScriptExecutor.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@ public void execute(StatusHook hook) {
4646
if (getPackageJsonPath() != null) {
4747
argsList.addAll(Arrays.asList("-c", getPackageJsonPath()));
4848
}
49-
argsList.add("--profile");
50-
argsList.add(getProjectRoot().resolve("profiles/default").toString());
5149
// Execute the command
5250
RootCommand rootCommand = new RootCommand(rootDir, hook);
5351
int exitCode =

sqrl-testing/sqrl-integration-tests/src/test/java/com/datasqrl/UseCasesIT.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ public void execute(String goal, String path, String script, String graphql, Str
3434
argsList.add("-s"); argsList.add("snapshots-"+testSuffix);
3535
argsList.add("--tests"); argsList.add("tests-"+testSuffix);
3636
}
37-
argsList.add("--profile");
38-
argsList.add(getProjectRoot(rootDir).resolve("profiles/default").toString());
3937
argsList.addAll(Arrays.asList(args));
4038

4139
execute(rootDir, new AssertStatusHook(), argsList.toArray(String[]::new));
@@ -47,8 +45,6 @@ protected void compile(String path, String script, String graphql) {
4745
argsList.add("compile");
4846
argsList.add(script);
4947
if (!Strings.isNullOrEmpty(graphql)) argsList.add(graphql);
50-
argsList.add("--profile");
51-
argsList.add(getProjectRoot(rootDir).resolve("profiles/default").toString());
5248
execute(RESOURCES.resolve(path),
5349
new AssertStatusHook(), argsList.toArray(a->new String[a]));
5450
}

sqrl-tools/sqrl-cli/src/test/java/com/datasqrl/cmd/TestCmd.java

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -133,24 +133,6 @@ public void compileNutshop() {
133133
createSnapshot();
134134
}
135135

136-
@SneakyThrows
137-
@Test
138-
public void compileProfiles() {
139-
execute(PROFILES_PATH, "compile",
140-
"myscript.sqrl", "schema.graphqls",
141-
"--profile", "profile1",
142-
"--profile", "profile2",
143-
"--mnt", "/example/dir"
144-
);
145-
146-
snapshot.addContent(
147-
Files.readString(PROFILES_PATH.resolve("build").resolve("package.json")));
148-
149-
snapshot.addContent(
150-
Files.readString(PROFILES_PATH.resolve("build").resolve("deploy").resolve("docker-compose.yml")));
151-
createSnapshot();
152-
}
153-
154136
@Test
155137
@SneakyThrows
156138
public void compileError() {

0 commit comments

Comments
 (0)