From 74a41cc1e1184dac1ee698ef5355d8d330de6ad1 Mon Sep 17 00:00:00 2001 From: Paul Kuruvilla Date: Tue, 27 Aug 2024 19:18:13 +0100 Subject: [PATCH 1/2] update uncomment usage --- starter_templates/go/code/app/main.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/starter_templates/go/code/app/main.go b/starter_templates/go/code/app/main.go index d1c4195..69597a3 100644 --- a/starter_templates/go/code/app/main.go +++ b/starter_templates/go/code/app/main.go @@ -2,11 +2,14 @@ package main import ( "fmt" - // Uncomment this block to pass the first stage! - // "os" - // "os/exec" + "os" + "os/exec" ) +// Ensures gofmt doesn't remove the imports above (feel free to remove this!) +var _ = os.Args +var _ = exec.Command + // Usage: your_docker.sh run ... func main() { // You can use print statements as follows for debugging, they'll be visible when running tests. From 19260c910d1ecb3f13e3da21136ab51c8d7d48b7 Mon Sep 17 00:00:00 2001 From: Paul Kuruvilla Date: Tue, 27 Aug 2024 19:19:49 +0100 Subject: [PATCH 2/2] update uncomment usage --- compiled_starters/go/app/main.go | 9 ++++++--- solutions/go/01-je9/code/app/main.go | 4 ++++ solutions/go/01-je9/diff/app/main.go.diff | 13 +++++++------ solutions/go/01-je9/explanation.md | 6 ------ 4 files changed, 17 insertions(+), 15 deletions(-) diff --git a/compiled_starters/go/app/main.go b/compiled_starters/go/app/main.go index d1c4195..69597a3 100644 --- a/compiled_starters/go/app/main.go +++ b/compiled_starters/go/app/main.go @@ -2,11 +2,14 @@ package main import ( "fmt" - // Uncomment this block to pass the first stage! - // "os" - // "os/exec" + "os" + "os/exec" ) +// Ensures gofmt doesn't remove the imports above (feel free to remove this!) +var _ = os.Args +var _ = exec.Command + // Usage: your_docker.sh run ... func main() { // You can use print statements as follows for debugging, they'll be visible when running tests. diff --git a/solutions/go/01-je9/code/app/main.go b/solutions/go/01-je9/code/app/main.go index 59064ff..ca8a873 100644 --- a/solutions/go/01-je9/code/app/main.go +++ b/solutions/go/01-je9/code/app/main.go @@ -6,6 +6,10 @@ import ( "os/exec" ) +// Ensures gofmt doesn't remove the imports above (feel free to remove this!) +var _ = os.Args +var _ = exec.Command + // Usage: your_docker.sh run ... func main() { command := os.Args[3] diff --git a/solutions/go/01-je9/diff/app/main.go.diff b/solutions/go/01-je9/diff/app/main.go.diff index 491ff7e..452a823 100644 --- a/solutions/go/01-je9/diff/app/main.go.diff +++ b/solutions/go/01-je9/diff/app/main.go.diff @@ -1,15 +1,16 @@ -@@ -1,28 +1,22 @@ +@@ -1,31 +1,26 @@ package main import ( "fmt" -- // Uncomment this block to pass the first stage! -- // "os" -- // "os/exec" -+ "os" -+ "os/exec" + "os" + "os/exec" ) + // Ensures gofmt doesn't remove the imports above (feel free to remove this!) + var _ = os.Args + var _ = exec.Command + // Usage: your_docker.sh run ... func main() { - // You can use print statements as follows for debugging, they'll be visible when running tests. diff --git a/solutions/go/01-je9/explanation.md b/solutions/go/01-je9/explanation.md index 764beb8..e69fb6b 100644 --- a/solutions/go/01-je9/explanation.md +++ b/solutions/go/01-je9/explanation.md @@ -2,12 +2,6 @@ The entry point for your Docker implementation is in `app/main.go`. Study and uncomment the relevant code: -```go -// Uncomment this block to pass the first stage! -"os" -"os/exec" -``` - ```go // Uncomment this block to pass the first stage!