Skip to content
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

fix format config on buildSrc kts srcipt #3593

Merged
merged 5 commits into from
Mar 25, 2022
Merged

fix format config on buildSrc kts srcipt #3593

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
07a3d7c
fix format config on buildSrc kts srcipt
BiLuoHen Mar 4, 2022
d636b69
flow the Google format
BiLuoHen Mar 5, 2022
0587339
add test code of setFormat
BiLuoHen Mar 8, 2022
31e0c7d
refactory the test code for setFormat
BiLuoHen Mar 14, 2022
f989f1e
fix test code
BiLuoHen Mar 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/ContainerParameters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,10 @@ public void setFormat(ImageFormat format) {
this.format = format;
}

public void setFormat(String format) {
this.format = ImageFormat.valueOf(format);
}

@Input
@Optional
public List<String> getPorts() {
Expand Down
2 changes: 2 additions & 0 deletions jib-gradle-plugin/src/test/java/com/google/cloud/tools/jib/gradle/JibExtensionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,8 @@ public void testContainer() {
assertThat(container.getArgs()).containsExactly("arg1", "arg2", "arg3").inOrder();
assertThat(container.getPorts()).containsExactly("1000", "2000-2010", "3000").inOrder();
assertThat(container.getFormat()).isSameInstanceAs(ImageFormat.OCI);
container.setFormat("Docker");
BiLuoHen marked this conversation as resolved.
Show resolved Hide resolved
assertThat(container.getFormat()).isSameInstanceAs(ImageFormat.Docker);
assertThat(container.getAppRoot()).isEqualTo("some invalid appRoot value");
assertThat(container.getFilesModificationTime()).isEqualTo("some invalid time value");
}
Expand Down