Merge pull request #207 from cybozu-go/update-202101

Update dependencies

.circleci/config.yml

@@ -62,7 +62,7 @@ commands:
 jobs:
   build:
     docker:
-      - image: quay.io/cybozu/golang:1.13-bionic
+      - image: quay.io/cybozu/golang:1.15-focal
       - image: quay.io/coreos/etcd:v3.3
     steps:
       - checkout

CHANGELOG.md

@@ -5,6 +5,12 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [2.5.5] - 2021-02-01
+
+### Changed
+- Update dependencies
+- Docker image is now built with Go 1.15 and based on Ubuntu 20.04
+
 ## [2.5.4] - 2021-01-28
 
 ### Changed
@@ -176,7 +182,8 @@ No changes.  Only for updating Docker base image.
 
 See [CHANGELOG-0](./CHANGELOG-0.md).
 
-[Unreleased]: https://github.com/cybozu-go/sabakan/compare/v2.5.4...HEAD
+[Unreleased]: https://github.com/cybozu-go/sabakan/compare/v2.5.5...HEAD
+[2.5.5]: https://github.com/cybozu-go/sabakan/compare/v2.5.4...v2.5.5
 [2.5.4]: https://github.com/cybozu-go/sabakan/compare/v2.5.3...v2.5.4
 [2.5.3]: https://github.com/cybozu-go/sabakan/compare/v2.5.2...v2.5.3
 [2.5.2]: https://github.com/cybozu-go/sabakan/compare/v2.5.1...v2.5.2

RELEASE.md

@@ -38,7 +38,7 @@ It should look like:
 Increment schema version
 ------------------------
 
-When a backward-incompatible change is to be merged to `master`, the schema version must be incremented
+When a backward-incompatible change is to be merged to `main`, the schema version must be incremented
 and conversion from old schema need to be implemented.
 
 1. Increment `SchemaVersion` in [version.go](./version.go) by 1.
@@ -50,7 +50,7 @@ Bump version
 ------------
 
 1. Determine a new API/program version number.  Let it write `$VERSION` as `VERSION=x.y.z`.
-2. Checkout `master` branch.
+2. Checkout `main` branch.
 3. Make a branch to release, for example by `git neco dev bump-$VERSION`
 4. Edit `CHANGELOG.md` for the new version ([example][]).
 5. Update `Version` constant in [version.go](./version.go).
@@ -62,7 +62,7 @@ Bump version
     ```
 
 7. Merge this branch.
-8. Checkout `master` branch.
+8. Checkout `main` branch.
 9. Add a git tag, then push it.
 
     ```console

docker/Dockerfile

@@ -1,5 +1,5 @@
 # Sabakan container
-FROM quay.io/cybozu/ubuntu:18.04
+FROM quay.io/cybozu/ubuntu:20.04
 
 RUN apt-get update \
     && apt-get -y install --no-install-recommends grub-ipxe \

docs/getting_started.md

@@ -65,7 +65,7 @@ A sample systemd service file is available at
 
 Alternatively, you may use docker to run sabakan:
 * Repository: [quay.io/cybozu/sabakan](https://quay.io/cybozu/sabakan)
-* Usage: https://github.com/cybozu/neco-containers/blob/master/sabakan/README.md
+* Usage: https://github.com/cybozu/neco-containers/blob/main/sabakan/README.md
 
 ## <a name="netboot" />Netboot
 

docs/sabakan.md

@@ -4,7 +4,7 @@ sabakan
 Usage
 -----
 
-See [specification of etcdutil](https://github.com/cybozu-go/etcdutil/blob/master/README.md#specifications) for etcd connection flags and parameters. 
+See [specification of etcdutil](https://github.com/cybozu-go/etcdutil/blob/main/README.md#specifications) for etcd connection flags and parameters. 
 
 ```console
 $ sabakan -h

go.mod

@@ -3,32 +3,29 @@ module github.com/cybozu-go/sabakan/v2
 replace google.golang.org/grpc => google.golang.org/grpc v1.26.0
 
 require (
-	github.com/99designs/gqlgen v0.9.3
-	github.com/agnivade/levenshtein v1.0.2 // indirect
+	github.com/99designs/gqlgen v0.13.0
 	github.com/ajeddeloh/go-json v0.0.0-20170920214419-6a2fe990e083 // indirect
-	github.com/coreos/etcd v3.3.15+incompatible
-	github.com/coreos/ignition v0.30.0
-	github.com/cybozu-go/etcdutil v1.3.4
-	github.com/cybozu-go/log v1.5.0
-	github.com/cybozu-go/netutil v1.2.0
-	github.com/cybozu-go/well v1.8.1
+	github.com/coreos/etcd v3.3.25+incompatible
+	github.com/coreos/ignition v0.35.0
+	github.com/cybozu-go/etcdutil v1.3.5
+	github.com/cybozu-go/log v1.6.0
+	github.com/cybozu-go/netutil v1.3.0
+	github.com/cybozu-go/well v1.10.0
 	github.com/google/go-cmp v0.5.4
 	github.com/google/go-tpm v0.3.2
-	github.com/hashicorp/go-version v1.0.0
-	github.com/hashicorp/golang-lru v0.5.1 // indirect
-	github.com/onsi/ginkgo v1.8.0
-	github.com/onsi/gomega v1.5.0
-	github.com/prometheus/client_golang v0.9.3
-	github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4
-	github.com/prometheus/common v0.4.0
-	github.com/spf13/cobra v1.0.0
-	github.com/vektah/gqlparser v1.1.2
-	github.com/vincent-petithory/dataurl v0.0.0-20160330182126-9a301d65acbb
+	github.com/hashicorp/go-version v1.2.1
+	github.com/onsi/ginkgo v1.14.2
+	github.com/onsi/gomega v1.10.4
+	github.com/prometheus/client_golang v1.9.0
+	github.com/prometheus/client_model v0.2.0
+	github.com/prometheus/common v0.15.0
+	github.com/spf13/cobra v1.1.1
+	github.com/vektah/gqlparser/v2 v2.1.0
+	github.com/vincent-petithory/dataurl v0.0.0-20191104211930-d1553a71de50
 	go.universe.tf/netboot v0.0.0-20181010164912-24067fad46fd
 	go4.org v0.0.0-20181109185143-00e24f1b2599 // indirect
-	golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d
-	golang.org/x/text v0.3.3 // indirect
-	sigs.k8s.io/yaml v1.1.0
+	golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad
+	sigs.k8s.io/yaml v1.2.0
 )
 
 go 1.13

gql/gqlgen.yml

@@ -1,16 +1,59 @@
-# Refer to https://gqlgen.com/config/
-# for detailed gqlgen.yml documentation.
-
+# Where are all the schema files located? globs are supported eg  src/**/*.graphqls
 schema:
-- schema.graphql
+  - graph/*.graphqls
+
+# Where should the generated server code go?
 exec:
-  filename: generated.go
+  filename: graph/generated/generated.go
+  package: generated
+
+# Uncomment to enable federation
+# federation:
+#   filename: graph/generated/federation.go
+#   package: generated
+
+# Where should any generated models go?
 model:
-  filename: models_gen.go
+  filename: graph/model/models_gen.go
+  package: model
+
+# Where should the resolver implementations go?
 resolver:
-  filename: resolver.go
-  type: Resolver
+  layout: follow-schema
+  dir: graph
+  package: graph
+
+# Optional: turn on use `gqlgen:"fieldName"` tags in your models
+# struct_tag: json
+
+# Optional: turn on to use []Thing instead of []*Thing
+# omit_slice_element_pointers: false
+
+# Optional: set to speed up generation time by not performing a final validation pass.
+# skip_validation: true
+
+# gqlgen will search for any type names in the schema in these go packages
+# if they match it will use them, otherwise it will generate them.
+autobind:
+  - "github.com/cybozu-go/sabakan/v2/gql/graph/model"
+
+# This section declares type mapping between the GraphQL and go type systems
+#
+# The first line in each type will be used as defaults for resolver arguments and
+# modelgen, the others will be allowed when binding to fields. Configure them to
+# your liking
 models:
+  ID:
+    model:
+      - github.com/99designs/gqlgen/graphql.ID
+      - github.com/99designs/gqlgen/graphql.Int
+      - github.com/99designs/gqlgen/graphql.Int64
+      - github.com/99designs/gqlgen/graphql.Int32
+  Int:
+    model:
+      - github.com/99designs/gqlgen/graphql.Int
+      - github.com/99designs/gqlgen/graphql.Int64
+      - github.com/99designs/gqlgen/graphql.Int32
   Machine:
     model: github.com/cybozu-go/sabakan/v2.Machine
   MachineSpec:
@@ -19,12 +62,6 @@ models:
     model: github.com/cybozu-go/sabakan/v2.MachineBMC
   MachineStatus:
     model: github.com/cybozu-go/sabakan/v2.MachineStatus
-  MachineState:
-    model: github.com/cybozu-go/sabakan/v2/gql.MachineState
-  IPAddress:
-    model: github.com/cybozu-go/sabakan/v2/gql.IPAddress
-  DateTime:
-    model: github.com/cybozu-go/sabakan/v2/gql.DateTime
   MachineInfo:
     model: github.com/cybozu-go/sabakan/v2.MachineInfo
   NetworkInfo:
@@ -33,3 +70,9 @@ models:
     model: github.com/cybozu-go/sabakan/v2.BMCInfo
   NICConfig:
     model: github.com/cybozu-go/sabakan/v2.NICConfig
+  MachineState:
+    model: github.com/cybozu-go/sabakan/v2/gql.MachineState
+  IPAddress:
+    model: github.com/cybozu-go/sabakan/v2/gql.IPAddress
+  DateTime:
+    model: github.com/cybozu-go/sabakan/v2/gql.DateTime