Merge pull request #567 from bryanl/554-underscore-fields

bugs: ksonnet lib printer

Gopkg.toml

@@ -52,7 +52,7 @@ required = ["k8s.io/kubernetes/pkg/kubectl/cmd/util"]
 
 [[constraint]]
   name = "github.com/ksonnet/ksonnet-lib"
-  version = "v0.1.5"
+  version = "v0.1.7"
 
 [[constraint]]
   name = "github.com/onsi/ginkgo"

metadata/params/testdata/delete-env-param/expected1.libsonnet

@@ -3,7 +3,7 @@ local params = {};
 params + {
   components+: {
     foo+: {
-      replicas: 1
-    }
-  }
+      replicas: 1,
+    },
+  },
 }

metadata/params/testdata/delete-env-param/expected2.libsonnet

@@ -3,7 +3,7 @@ local params = {};
 params {
   components+: {
     foo+: {
-      replicas: 1
-    }
-  }
+      replicas: 1,
+    },
+  },
 }

pkg/app/encoder.go

@@ -1,3 +1,18 @@
+// Copyright 2018 The ksonnet authors
+//
+//
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
+
 package app
 
 import (

pkg/app/override_test.go

@@ -1,3 +1,18 @@
+// Copyright 2018 The ksonnet authors
+//
+//
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
+
 package app
 
 import (

pkg/component/testdata/delete-env-params.libsonnet

@@ -1,5 +1,5 @@
-local params = import "../../components/params.libsonnet";
+local params = import '../../components/params.libsonnet';
 
 params {
-  components+: {}
+  components+: {},
 }

pkg/component/testdata/guestbook/delete-params.libsonnet

@@ -5,13 +5,13 @@
     // Each object below should correspond to a component in the components/ directory
     "guestbook-ui": {
       containerPort: 80,
-      image: "gcr.io/heptio-images/ks-guestbook-demo:0.1",
-      name: "guiroot",
+      image: 'gcr.io/heptio-images/ks-guestbook-demo:0.1',
+      name: 'guiroot',
       obj: {
-        a: "b"
+        a: 'b',
       },
       servicePort: 80,
-      type: "ClusterIP"
-    }
-  }
+      type: 'ClusterIP',
+    },
+  },
 }

pkg/component/testdata/guestbook/set-params.libsonnet

@@ -5,14 +5,14 @@
     // Each object below should correspond to a component in the components/ directory
     "guestbook-ui": {
       containerPort: 80,
-      image: "gcr.io/heptio-images/ks-guestbook-demo:0.1",
-      name: "guiroot",
+      image: 'gcr.io/heptio-images/ks-guestbook-demo:0.1',
+      name: 'guiroot',
       obj: {
-        a: "b"
+        a: 'b',
       },
       replicas: 4,
       servicePort: 80,
-      type: "ClusterIP"
-    }
-  }
+      type: 'ClusterIP',
+    },
+  },
 }

pkg/component/testdata/params-delete-entry.libsonnet

@@ -4,7 +4,7 @@
     // Component-level parameters, defined initially from 'ks prototype use ...'
     // Each object below should correspond to a component in the components/ directory
     "certificate-crd": {
-      spec: {}
-    }
-  }
+      spec: {},
+    },
+  },
 }

pkg/component/testdata/params-delete-global.libsonnet

@@ -5,9 +5,9 @@
       other: 1,
       metadata: {
         labels: {
-          locala: "local"
-        }
-      }
-    }
-  }
+          locala: 'local',
+        },
+      },
+    },
+  },
 }

pkg/component/testdata/updated-yaml-params.libsonnet

@@ -3,8 +3,8 @@
   components: {
     "certificate-crd": {
       spec: {
-        version: "v2"
-      }
-    }
-  }
+        version: 'v2',
+      },
+    },
+  },
 }

pkg/env/testdata/add-global.libsonnet

@@ -1,3 +1,3 @@
 {
-  foo: "bar"
+  foo: 'bar',
 }

pkg/env/testdata/delete-params.libsonnet

@@ -1,7 +1,7 @@
-local params = import "../../components/params.libsonnet";
+local params = import '../../components/params.libsonnet';
 
 params + {
   components+: {
-    component1+: {}
-  }
+    component1+: {},
+  },
 }

pkg/env/testdata/params.libsonnet

@@ -1,8 +1,8 @@
-local params = import "../../components/params.libsonnet";
+local params = import '../../components/params.libsonnet';
 params + {
   components +: {
     component1 +: {
-      foo: "bar",
+      foo: 'bar',
     },
   },
 }

pkg/env/testdata/updated-params.libsonnet

@@ -1,9 +1,9 @@
-local params = import "../../components/params.libsonnet";
+local params = import '../../components/params.libsonnet';
 
 params + {
   components+: {
     component1+: {
-      foo: "bar"
-    }
-  }
+      foo: 'bar',
+    },
+  },
 }

pkg/params/testdata/env/globals/remove-component/out.libsonnet

@@ -1,11 +1,12 @@
-local params = std.extVar("__ksonnet/params");
-local globals = import "globals.libsonnet";
+local params = std.extVar('__ksonnet/params');
+local globals = import 'globals.libsonnet';
 local envParams = params + {
-  components+: {}
+  components+: {},
 };
 
 {
   components: {
-    [x]: envParams.components[x] + globals for x in std.objectFields(envParams.components)
-  }
+    [x]: envParams.components[x] + globals
+    for x in std.objectFields(envParams.components)
+  },
 }

pkg/params/testdata/env/globals/set-global/out.libsonnet

@@ -1 +1 @@
-{group: "dev"}
+{ group: 'dev' }

pkg/params/testdata/env/globals/set/out-new-component.libsonnet

@@ -1,19 +1,20 @@
-local params = std.extVar("__ksonnet/params");
-local globals = import "globals.libsonnet";
+local params = std.extVar('__ksonnet/params');
+local globals = import 'globals.libsonnet';
 local envParams = params + {
   components+: {
     guestbook+: {
-      name: "guestbook-dev",
-      replicas: params.global.replicas
+      name: 'guestbook-dev',
+      replicas: params.global.replicas,
     },
     component+: {
-      name: "new-component"
-    }
-  }
+      name: 'new-component',
+    },
+  },
 };
 
 {
   components: {
-    [x]: envParams.components[x] + globals for x in std.objectFields(envParams.components)
-  }
+    [x]: envParams.components[x] + globals
+    for x in std.objectFields(envParams.components)
+  },
 }

pkg/params/testdata/env/globals/set/out.libsonnet

@@ -1,17 +1,18 @@
-local params = std.extVar("__ksonnet/params");
-local globals = import "globals.libsonnet";
+local params = std.extVar('__ksonnet/params');
+local globals = import 'globals.libsonnet';
 local envParams = params + {
   components+: {
     guestbook+: {
-      name: "guestbook-dev",
+      name: 'guestbook-dev',
       replicas: params.global.replicas,
-      containerPort: 8080
-    }
-  }
+      containerPort: 8080,
+    },
+  },
 };
 
 {
   components: {
-    [x]: envParams.components[x] + globals for x in std.objectFields(envParams.components)
-  }
+    [x]: envParams.components[x] + globals
+    for x in std.objectFields(envParams.components)
+  },
 }

pkg/params/testdata/env/globals/unset/out.libsonnet

@@ -1,15 +1,16 @@
-local params = std.extVar("__ksonnet/params");
-local globals = import "globals.libsonnet";
+local params = std.extVar('__ksonnet/params');
+local globals = import 'globals.libsonnet';
 local envParams = params + {
   components+: {
     guestbook+: {
-      name: "guestbook-dev"
-    }
-  }
+      name: 'guestbook-dev',
+    },
+  },
 };
 
 {
   components: {
-    [x]: envParams.components[x] + globals for x in std.objectFields(envParams.components)
-  }
+    [x]: envParams.components[x] + globals
+    for x in std.objectFields(envParams.components)
+  },
 }

pkg/params/testdata/env/no-globals/remove-component/out.libsonnet

@@ -1,5 +1,5 @@
-local params = import "../../components/params.libsonnet";
+local params = import '../../components/params.libsonnet';
 
 params + {
-  components+: {}
+  components+: {},
 }

pkg/params/testdata/env/no-globals/set/out.libsonnet

@@ -1,11 +1,11 @@
-local params = import "../../components/params.libsonnet";
+local params = import '../../components/params.libsonnet';
 
 params + {
   components+: {
     guestbook+: {
-      name: "guestbook-dev",
+      name: 'guestbook-dev',
       replicas: params.global.replicas,
-      containerPort: 8080
-    }
-  }
+      containerPort: 8080,
+    },
+  },
 }

pkg/params/testdata/env/no-globals/unset/out.libsonnet

@@ -1,9 +1,9 @@
-local params = import "../../components/params.libsonnet";
+local params = import '../../components/params.libsonnet';
 
 params + {
   components+: {
     guestbook+: {
-      name: "guestbook-dev"
-    }
-  }
+      name: 'guestbook-dev',
+    },
+  },
 }