Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: eclipse-furo/eclipsefuro
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.36.0
Choose a base ref
...
head repository: eclipse-furo/eclipsefuro
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.36.1
Choose a head ref
  • 5 commits
  • 7 files changed
  • 1 contributor

Commits on May 17, 2022

  1. Copy the full SHA
    8cc1ec9 View commit details
  2. chore: yq version in BEC

    veith committed May 17, 2022
    Copy the full SHA
    c35801c View commit details
  3. Merge pull request #24 from eclipse/feat/BEC1.36.0

    BEC 1.36.0
    veith authored May 17, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    80a6217 View commit details

Commits on Jun 13, 2022

  1. Copy the full SHA
    054c016 View commit details
  2. Merge pull request #27 from eclipse/fix/genEsModule

    fix: genEsModule sets type enum on fields which uses a enum type
    veith authored Jun 13, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    6d1014c View commit details
Showing with 21 additions and 14 deletions.
  1. +6 −6 BEC/Dockerfile
  2. +1 −1 furo/cmd/root.go
  3. +1 −1 furo/flow_test.go
  4. +1 −1 furo/init_test.go
  5. +1 −1 furo/installer_test.go
  6. +8 −1 furo/internal/cmd/genEsModule/genEsModule.go
  7. +3 −3 furo/spec2muSpec_test.go
12 changes: 6 additions & 6 deletions BEC/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM golang:1.16.5-alpine3.14

ENV SIMPLEGENEREATOR_VERSION=1.0.1
ENV FURO_VERSION=1.35.0
ENV GATEWAY_VERSION=2.6.0
ENV GEN_GO_VERSION=1.27.1
ENV GEN_GO_GRPC_VERSION=1.1.0
ENV YQ_VERSION=4.12.2
ENV BUF_VERSION=1.0.0-rc12
ENV FURO_VERSION=1.36.0
ENV GATEWAY_VERSION=2.10.0
ENV GEN_GO_VERSION=1.28.0
ENV GEN_GO_GRPC_VERSION=1.2.0
ENV YQ_VERSION=4.25.1
ENV BUF_VERSION=1.4.0
ENV GOBIN $GOPATH/bin
ENV PATH="$PATH:$GOPATH/bin"
ENV PATH="/usr/local/sbin:$PATH"
2 changes: 1 addition & 1 deletion furo/cmd/root.go
Original file line number Diff line number Diff line change
@@ -50,7 +50,7 @@ Modify your default flow in the .furo config file to your needs. You can set any
Run: func(cmd *cobra.Command, args []string) {
runner.Run(cmd, args)
},
Version: "1.36.0",
Version: "1.36.1",
}

// Execute adds all child commands to the root command and sets flags appropriately.
2 changes: 1 addition & 1 deletion furo/flow_test.go
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ func TestRunCommand(t *testing.T) {
rco.Execute()

require.Equal(t, true, test.FileExist(path.Join(dir, ".furo")))
require.Equal(t, "1d5bc788b2dddab1c7cc1e3e62e6682e", test.MustMd5Sum(path.Join(dir, ".furo")))
require.Equal(t, "f5dfacb251ad443ddd69f569b36665b0", test.MustMd5Sum(path.Join(dir, ".furo")))

os.Args = []string{"cmd", "install"}
rco.Execute()
2 changes: 1 addition & 1 deletion furo/init_test.go
Original file line number Diff line number Diff line change
@@ -18,6 +18,6 @@ func TestInitCommand(t *testing.T) {
rco.Execute()

require.Equal(t, true, test.FileExist(path.Join(dir, ".furo")))
require.Equal(t, "1d5bc788b2dddab1c7cc1e3e62e6682e", test.MustMd5Sum(path.Join(dir, ".furo")))
require.Equal(t, "f5dfacb251ad443ddd69f569b36665b0", test.MustMd5Sum(path.Join(dir, ".furo")))

}
2 changes: 1 addition & 1 deletion furo/installer_test.go
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ func TestInstallCommand(t *testing.T) {
rco.Execute()

require.Equal(t, true, test.FileExist(path.Join(dir, ".furo")))
require.Equal(t, "1d5bc788b2dddab1c7cc1e3e62e6682e", test.MustMd5Sum(path.Join(dir, ".furo")))
require.Equal(t, "f5dfacb251ad443ddd69f569b36665b0", test.MustMd5Sum(path.Join(dir, ".furo")))

os.Args = []string{"cmd", "install"}
rco.Execute()
9 changes: 8 additions & 1 deletion furo/internal/cmd/genEsModule/genEsModule.go
Original file line number Diff line number Diff line change
@@ -51,17 +51,24 @@ func Run(cmd *cobra.Command, args []string) {

field.Meta.Options.Flags = append(field.Meta.Options.Flags, "enum")
// loop all enum values to build the options
isenum := false
for enum := allTypes[field.Type].Values.Oldest(); enum != nil; enum = enum.Next() {
option := map[string]interface{}{}
option["display_name"] = strings.ToLower("enum." + field.Type + "." + enum.Key.(string) + ".label")
option["id"] = enum.Value.(*int32)
option["@type"] = "type.googleapis.com/furo.Optionitem"
option["selected"] = false
field.Meta.Options.List = append(field.Meta.Options.List, &option)
isenum = true
}

// fmt.Println(k, allTypes[field.Type].Values)
// set the type on the field to enum
if isenum {
field.Meta.Typespecific = &map[string]interface{}{"enum": field.Type}
field.Type = "enum"
}
}

}
}

6 changes: 3 additions & 3 deletions furo/spec2muSpec_test.go
Original file line number Diff line number Diff line change
@@ -47,9 +47,9 @@ func TestSpec2muSpecCommand(t *testing.T) {
require.Equal(t, true, test.FileExist(path.Join(dir, "muspecs")))

// initial were 2 files in muspec, spec2Muspec creates one file per spec, so we have 4 files now
require.Equal(t, "f9456cc68a2b69691d5cbca5a7fcb5aa", test.MustMd5Sum(path.Join(dir, "muspecs", "sample", "Sample.types.yaml")))
require.Equal(t, "102b3562851cc4bac750b6d409344f6e", test.MustMd5Sum(path.Join(dir, "muspecs", "sample", "SampleCollection.types.yaml")))
require.Equal(t, "cecdceb48471dc1b2ebc958ce30e97bb", test.MustMd5Sum(path.Join(dir, "muspecs", "sample", "SampleEntity.types.yaml")))
require.Equal(t, "6e90ff428e600c214b2d54b649f3e29f", test.MustMd5Sum(path.Join(dir, "muspecs", "sample", "Sample.types.yaml")))
require.Equal(t, "cbbcb8c070aebbaf7d7db052c77065cf", test.MustMd5Sum(path.Join(dir, "muspecs", "sample", "SampleCollection.types.yaml")))
require.Equal(t, "744327bcc82804c191f9c85c0d2f37be", test.MustMd5Sum(path.Join(dir, "muspecs", "sample", "SampleEntity.types.yaml")))
require.Equal(t, "32ab721229ebbea7fe4fc42bc4a34a1a", test.MustMd5Sum(path.Join(dir, "muspecs", "sample", "Samples.services.yaml")))

}