Add optional installation of Bicep

Signed-off-by: Kim Christensen <[email protected]>
getporter · Jul 8, 2024 · d744f76 · d744f76
1 parent 732c043
commit d744f76
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 0 deletions.
diff --git a/pkg/az/build.go b/pkg/az/build.go
@@ -28,6 +28,9 @@ type MixinConfig struct {
 
 	// Extensions is a list of az CLI extensions to install.
 	Extensions []string `yaml:"extensions,omitempty"`
+
+	// Indicates if Bicep should be installed
+	InstallBicep bool `yaml:"installBicep,omitempty"`
 }
 
 // buildConfig is the set of configuration options for the mixin's portion of the Dockerfile
@@ -50,10 +53,14 @@ RUN curl -sL https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor >
 RUN echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ $(lsb_release -cs) main" > /etc/apt/sources.list.d/azure-cli.list
 RUN --mount=type=cache,target=/var/cache/apt --mount=type=cache,target=/var/lib/apt \
 	apt-get update && apt-get install -y --no-install-recommends \
+	{{ if .InstallBicep }}libicu72 \{{ end }}
 	{{ if eq .ClientVersion ""}}azure-cli{{else}}azure-cli={{.ClientVersion}}-1~$(lsb_release -cs){{end}}
 {{ range $ext := .Extensions }}
 RUN az extension add -y --name {{ $ext }}
 {{ end }}
+{{ if .InstallBicep }}
+RUN az bicep install
+{{ end }}
 `
 
 // Build installs the az cli and any configured extensions.

diff --git a/pkg/az/build_test.go b/pkg/az/build_test.go
@@ -19,6 +19,7 @@ func TestMixin_Build(t *testing.T) {
 	}{
 		{name: "build with config", inputFile: "testdata/build-input-with-config.yaml", wantOutputFile: "testdata/build-with-config.txt"},
 		{name: "build without config", inputFile: "testdata/build-input-without-config.yaml", wantOutputFile: "testdata/build-without-config.txt"},
+		{name: "build with bicep", inputFile: "testdata/build-input-with-bicep.yaml", wantOutputFile: "testdata/build-with-bicep.txt"},
 	}
 
 	for _, tc := range testcases {

diff --git a/pkg/az/schema/schema.json b/pkg/az/schema/schema.json
@@ -29,6 +29,10 @@
               "items": {
                 "type": "string"
               }
+            },
+            "installBicep": {
+              "description": "Indicates if Bicep should be install",
+              "type": "boolean"
             }
           },
           "additionalProperties": false

diff --git a/pkg/az/testdata/build-input-with-bicep.yaml b/pkg/az/testdata/build-input-with-bicep.yaml
@@ -0,0 +1,15 @@
+config:
+  userAgentOptOut: true
+  clientVersion: 1.2.3
+  extensions:
+    - iot
+  installBicep: true
+
+actions:
+  install:
+    - az:
+        arguments:
+          - login
+        description: Login
+  uninstall: []
+  upgrade: []
diff --git a/pkg/az/testdata/build-with-bicep.txt b/pkg/az/testdata/build-with-bicep.txt
@@ -0,0 +1,17 @@
+
+ENV PORTER_AZ_MIXIN_USER_AGENT_OPT_OUT="true"
+ENV AZURE_HTTP_USER_AGENT=""
+RUN --mount=type=cache,target=/var/cache/apt --mount=type=cache,target=/var/lib/apt \
+	apt-get update && apt-get install -y apt-transport-https lsb-release gnupg curl
+RUN curl -sL https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > /etc/apt/trusted.gpg.d/microsoft.asc.gpg
+RUN echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ $(lsb_release -cs) main" > /etc/apt/sources.list.d/azure-cli.list
+RUN --mount=type=cache,target=/var/cache/apt --mount=type=cache,target=/var/lib/apt \
+	apt-get update && apt-get install -y --no-install-recommends \
+	libicu72 \
+	azure-cli=1.2.3-1~$(lsb_release -cs)
+
+RUN az extension add -y --name iot
+
+
+RUN az bicep install
+
diff --git a/pkg/az/testdata/build-with-config.txt b/pkg/az/testdata/build-with-config.txt
@@ -7,7 +7,9 @@ RUN curl -sL https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor >
 RUN echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ $(lsb_release -cs) main" > /etc/apt/sources.list.d/azure-cli.list
 RUN --mount=type=cache,target=/var/cache/apt --mount=type=cache,target=/var/lib/apt \
 	apt-get update && apt-get install -y --no-install-recommends \
+
 	azure-cli=1.2.3-1~$(lsb_release -cs)
 
 RUN az extension add -y --name iot
 
+
diff --git a/pkg/az/testdata/build-without-config.txt b/pkg/az/testdata/build-without-config.txt
@@ -7,5 +7,7 @@ RUN curl -sL https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor >
 RUN echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ $(lsb_release -cs) main" > /etc/apt/sources.list.d/azure-cli.list
 RUN --mount=type=cache,target=/var/cache/apt --mount=type=cache,target=/var/lib/apt \
 	apt-get update && apt-get install -y --no-install-recommends \
+
 	azure-cli
 
+