Merge pull request #1050 from laverya/render-filemodes-properly

Render filemodes properly
replicatedhq · Aug 26, 2019 · 6f46010 · 6f46010
2 parents a0af920 + a56ab68
commit 6f46010
Show file tree

Hide file tree

Showing 22 changed files with 477 additions and 147 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/hack/docs/mutations.json b/hack/docs/mutations.json
@@ -70,7 +70,6 @@
       "examples": [
         {
           "dest": "install.sh",
-          "mode": 755,
           "contents": "#!/bin/sh\nkubectl apply -f ./deploy.yml -n {{repl ConfigOption \"k8s_namespace\" }}"
         },
         {
@@ -101,7 +100,7 @@
   {
     "path": "properties.assets.properties.v1.items.properties.inline.properties.mode",
     "merge": {
-      "description": "Specifies file mode of the created asset, defaults to `0644`"
+      "description": "Specifies file mode of the created asset, defaults to `0644`. Make sure to include a leading `0` if specifying an octal value"
     }
   },
   {
@@ -162,7 +161,7 @@
   {
     "path": "properties.assets.properties.v1.items.properties.docker.properties.mode",
     "merge": {
-      "description": "The unix file permissions to be set on the image tar archive, e.g `600`."
+      "description": "The unix file permissions to be set on the image tar archive, e.g `0600`. Make sure to include a leading `0` if specifying an octal value"
     }
   },
   {
@@ -456,7 +455,7 @@
   {
     "path": "properties.assets.properties.v1.items.properties.github.properties.mode",
     "merge": {
-      "description": "If present, overrides the file mode of all files included by this asset."
+      "description": "If present, overrides the file mode of all files included by this asset. Make sure to include a leading `0` if specifying an octal value"
     }
   },
   {
@@ -562,7 +561,7 @@
   {
     "path": "properties.assets.properties.v1.items.properties.web.properties.mode",
     "merge": {
-      "description": "Unix file permissions to set on the asset"
+      "description": "Unix file permissions to set on the asset. Make sure to include a leading `0` if specifying an octal value"
     }
   },
   {
@@ -1041,7 +1040,7 @@
   {
     "path": "properties.assets.properties.v1.items.properties.terraform.properties.mode",
     "merge": {
-      "description": "Specifies file mode of the created asset, defaults to `0644`"
+      "description": "Specifies file mode of the created asset, defaults to `0644`. Make sure to include a leading `0` if specifying an octal value"
     }
   },
   {

diff --git a/hack/docs/schema.json b/hack/docs/schema.json
@@ -337,7 +337,7 @@
                     "type": "string"
                   },
                   "mode": {
-                    "description": "The unix file permissions to be set on the image tar archive, e.g `600`.",
+                    "description": "The unix file permissions to be set on the image tar archive, e.g `0600`. Make sure to include a leading `0` if specifying an octal value",
                     "type": "integer"
                   },
                   "source": {
@@ -429,7 +429,7 @@
                     "type": "string"
                   },
                   "mode": {
-                    "description": "If present, overrides the file mode of all files included by this asset.",
+                    "description": "If present, overrides the file mode of all files included by this asset. Make sure to include a leading `0` if specifying an octal value",
                     "type": "integer"
                   },
                   "path": {
@@ -689,7 +689,6 @@
                 "examples": [
                   {
                     "dest": "install.sh",
-                    "mode": 755,
                     "contents": "#!/bin/sh\nkubectl apply -f ./deploy.yml -n {{repl ConfigOption \"k8s_namespace\" }}"
                   },
                   {
@@ -711,7 +710,7 @@
                     "type": "string"
                   },
                   "mode": {
-                    "description": "Specifies file mode of the created asset, defaults to `0644`",
+                    "description": "Specifies file mode of the created asset, defaults to `0644`. Make sure to include a leading `0` if specifying an octal value",
                     "type": "integer"
                   },
                   "when": {
@@ -749,7 +748,7 @@
                     "type": "string"
                   },
                   "mode": {
-                    "description": "Specifies file mode of the created asset, defaults to `0644`",
+                    "description": "Specifies file mode of the created asset, defaults to `0644`. Make sure to include a leading `0` if specifying an octal value",
                     "type": "integer"
                   },
                   "when": {
@@ -806,7 +805,7 @@
                     "type": "string"
                   },
                   "mode": {
-                    "description": "Unix file permissions to set on the asset",
+                    "description": "Unix file permissions to set on the asset. Make sure to include a leading `0` if specifying an octal value",
                     "type": "integer"
                   },
                   "url": {
@@ -950,6 +949,14 @@
                   "path": {
                     "type": "string"
                   },
+                  "readme": {
+                    "type": "object",
+                    "properties": {
+                      "contents": {
+                        "type": "string"
+                      }
+                    }
+                  },
                   "requires": {
                     "type": "array",
                     "items": {

diff --git a/integration/init/jaeger-helm/expected/base/charts/cassandra/templates/service.yaml b/integration/init/jaeger-helm/expected/base/charts/cassandra/templates/service.yaml
@@ -6,7 +6,7 @@ metadata:
   name: jaeger-cassandra
   labels:
     app: cassandra
-    chart: cassandra-0.13.1
+    chart: cassandra-0.13.2
     release: jaeger
     heritage: Tiller
 spec:

diff --git a/integration/init/jaeger-helm/expected/base/charts/cassandra/templates/statefulset.yaml b/integration/init/jaeger-helm/expected/base/charts/cassandra/templates/statefulset.yaml
@@ -6,7 +6,7 @@ metadata:
   name: jaeger-cassandra
   labels:
     app: cassandra
-    chart: cassandra-0.13.1
+    chart: cassandra-0.13.2
     release: jaeger
     heritage: Tiller
 spec:

diff --git a/pkg/lifecycle/render/github/render.go b/pkg/lifecycle/render/github/render.go
@@ -167,6 +167,7 @@ func (r *LocalRenderer) resolveProxyGithubAssets(asset api.GitHubAsset, builder
 
 		mode := os.FileMode(0644) // TODO: how to get mode info from github?
 		if asset.AssetShared.Mode != os.FileMode(0000) {
+			debug.Log("event", "applying override permissions", "override.filemode", asset.AssetShared.Mode, "override.filemode.int", int(asset.AssetShared.Mode))
 			mode = asset.AssetShared.Mode
 		}
 		if err := rootFs.WriteFile(filePath, []byte(built), mode); err != nil {

diff --git a/pkg/lifecycle/render/inline/render.go b/pkg/lifecycle/render/inline/render.go
@@ -85,14 +85,18 @@ func (r *LocalRenderer) Execute(
 
 		mode := os.FileMode(0644)
 		if builtAsset.Mode != os.FileMode(0) {
-			debug.Log("event", "applying override permissions")
+			debug.Log("event", "applying override permissions", "override.filemode", builtAsset.Mode, "override.filemode.int", int(builtAsset.Mode))
 			mode = builtAsset.Mode
 		}
 
 		if err := rootFs.WriteFile(builtAsset.Dest, []byte(builtAsset.Contents), mode); err != nil {
 			debug.Log("event", "execute.fail", "err", err)
 			return errors.Wrapf(err, "Write inline asset to %s", builtAsset.Dest)
 		}
+		if err := rootFs.Chmod(builtAsset.Dest, mode); err != nil {
+			debug.Log("event", "chmod.fail", "err", err)
+			return errors.Wrapf(err, "Set inline asset %s filemode to %s", builtAsset.Dest, mode)
+		}
 		return nil
 
 	}