devfile 0.0.15.pre.alpha1 → 0.0.17.pre.alpha1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 739a883993edbb196e10d9254497cb37ff6cbe127c339cc7bee634c1c70cb797
-  data.tar.gz: 290cdcf0ed586f6f22379258493f1d322dac3e0e0256f6f440e7defbf685d37c
+  metadata.gz: 0caaa2073d33653ef8b632c083e866dec6f2d29db102cf7426098ae4fb6120d8
+  data.tar.gz: 268b1d8ea8f9f37209129d67de14acb90cb133ac2b1f0e062511e1b5e3de5213
 SHA512:
-  metadata.gz: 7949066754c11a31d4b70d04c3389484d23151189b844a954afde42734bbe87beeccd66d9f022af74868b3b031d13a9e7afff7e57e1fa04d92079bfab7a7582f
-  data.tar.gz: f81e3722a30ca33dfc8832047739956d58c89f7d96791d731619748d07e9ee9ed9c20b1b2d2cabb9d70de2e5350fb65946bbe12d0de3ecc2c3967b4d667e24a4
+  metadata.gz: 574fe4a35ba43896753bc97c5dd0a3845bb7669067ddabec583cc913a11a5e97a57f93596e61ccca5eb869f1afda8162bc003a62979c8217e83358b07bbd3a57
+  data.tar.gz: f5d4e53057b98eafc7b7f17abb49cb66cdc827ea43536a93ef2fff27f927a0a49a16cb1ce06c56c03298bfd78ad01e075a04530d8ecc875ad1ee9bd4cf13bf30

data/ext/devfile.go

@@ -7,6 +7,7 @@ import (
 	"strconv"
 	"text/template"
 
+	"github.com/devfile/library/v2/pkg/devfile"
 	"github.com/devfile/library/v2/pkg/devfile/generator"
 	"github.com/devfile/library/v2/pkg/devfile/parser"
 	"github.com/devfile/library/v2/pkg/devfile/parser/data/v2/common"
@@ -292,15 +293,21 @@ func (d Devfile) hasContainerComponents() (bool, error) {
 	return false, nil
 }
 
-func (d Devfile) getFlattenedDevfileContent() string {
-	return string(d.devfileObj.Ctx.GetDevfileContent())
+func (d Devfile) getFlattenedDevfileContent() (string, error) {
+	b, err := yaml.Marshal(d.devfileObj.Data)
+	if err != nil {
+		return "", err
+	}
+	return string(b), nil
 }
 
 func parseDevfile(content string) (Devfile, error) {
 	parserArgs := parser.ParserArgs{
 		Data: []byte(content),
 	}
-	devfileObj, err := parser.ParseDevfile(parserArgs)
+	// TODO: figure out how to handle warnings
+	// 		https://gitlab.com/gitlab-org/remote-development/devfile-gem/-/issues/6
+	devfileObj, _, err := devfile.ParseDevfileAndValidate(parserArgs)
 	return Devfile{
 		devfileObj: devfileObj,
 	}, err

data/ext/go.mod

@@ -1,8 +1,9 @@
 module gitlab-org/remote-development/devfile-gem
 
-go 1.18
+go 1.19
 
 require (
+	github.com/devfile/api/v2 v2.2.0
 	github.com/devfile/library/v2 v2.2.0
 	k8s.io/api v0.26.1
 	k8s.io/apimachinery v0.26.1
@@ -19,7 +20,6 @@ require (
 	github.com/cespare/xxhash/v2 v2.1.2 // indirect
 	github.com/containerd/containerd v1.5.9 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/devfile/api/v2 v2.2.0 // indirect
 	github.com/devfile/registry-support/index/generator v0.0.0-20221018203505-df96d34d4273 // indirect
 	github.com/devfile/registry-support/registry-library v0.0.0-20221018213054-47b3ffaeadba // indirect
 	github.com/docker/cli v20.10.11+incompatible // indirect

data/ext/main.go

@@ -232,7 +232,10 @@ func flatten(devfile string) (string, error) {
 	if err != nil {
 		return "", err
 	}
-	flattenedDevfile := d.getFlattenedDevfileContent()
+	flattenedDevfile, err := d.getFlattenedDevfileContent()
+	if err != nil {
+		return "", err
+	}
 	content, err := marshalDevfile(flattenedDevfile)
 	if err != nil {
 		return "", err

data/lib/devfile.rb

@@ -10,57 +10,33 @@ module Devfile
 
     class << self
       def get_deployment(devfile, name, namespace, labels, annotations, replicas)
-        stdout, stderr, status = Open3.capture3(
-          "#{FILE_PATH} deployment '#{devfile}' #{name} #{namespace} '#{labels}' '#{annotations}' #{replicas}"
-        )
-
-        raise stderr unless status.success?
-
-        stdout
+        call('deployment', devfile, name, namespace, labels, annotations, replicas)
       end
 
       def get_service(devfile, name, namespace, labels, annotations)
-        stdout, stderr, status = Open3.capture3(
-          "#{FILE_PATH} service '#{devfile}' #{name} #{namespace} '#{labels}' '#{annotations}'"
-        )
-
-        raise stderr unless status.success?
-
-        stdout
+        call('service', devfile, name, namespace, labels, annotations)
       end
 
       def get_ingress(devfile, name, namespace, labels, annotations, domain_template, ingress_class)
-        stdout, stderr, status = Open3.capture3(
-          "#{FILE_PATH} ingress '#{devfile}' #{name} #{namespace} '#{labels}' '#{annotations}' #{domain_template} #{ingress_class}"
-        )
-
-        raise stderr unless status.success?
-
-        stdout
+        call('ingress', devfile, name, namespace, labels, annotations, domain_template, ingress_class)
       end
 
       def get_pvc(devfile, name, namespace, labels, annotations)
-        stdout, stderr, status = Open3.capture3(
-          "#{FILE_PATH} deployment '#{devfile}' #{name} #{namespace} '#{labels}' '#{annotations}'"
-        )
-
-        raise stderr unless status.success?
-
-        stdout
+        call('deployment', devfile, name, namespace, labels, annotations)
       end
 
       def get_all(devfile, name, namespace, labels, annotations, replicas, domain_template, ingress_class)
-        stdout, stderr, status = Open3.capture3(
-          "#{FILE_PATH} all '#{devfile}' #{name} #{namespace}  '#{labels}' '#{annotations}' #{replicas} #{domain_template} #{ingress_class}"
-        )
-
-        raise stderr unless status.success?
-
-        stdout
+        call('all', devfile, name, namespace, labels, annotations, replicas, domain_template, ingress_class)
       end
 
       def flatten(devfile)
-        stdout, stderr, status = Open3.capture3("#{FILE_PATH} flatten '#{devfile}'")
+        call('flatten', devfile)
+      end
+
+      private
+
+      def call(*cmd)
+        stdout, stderr, status = Open3.capture3({}, FILE_PATH, *cmd.map(&:to_s))
 
         raise stderr unless status.success?
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devfile
 version: !ruby/object:Gem::Version
-  version: 0.0.15.pre.alpha1
+  version: 0.0.17.pre.alpha1
 platform: ruby
 authors:
 - GitLab
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-27 00:00:00.000000000 Z
+date: 2023-05-08 00:00:00.000000000 Z
 dependencies: []
 description: Library used to generate kubernetes manifests from a Devfile.
 email:
@@ -46,7 +46,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.4.9
+rubygems_version: 3.4.12
 signing_key:
 specification_version: 4
 summary: Parse and generate kubernetes manifests from a Devfile