feat: support x-pathwar from docker-compose.yml

cdeleeuwe · Jul 28, 2020 · 6382783 · 6382783
1 parent 031d81a
commit 6382783
Show file tree

Hide file tree

Showing 6 changed files with 354 additions and 340 deletions.
diff --git a/api/pwdb.proto b/api/pwdb.proto
@@ -11,9 +11,9 @@ option (gogoproto.marshaler_all) = true;
 option (gogoproto.unmarshaler_all) = true;
 
 message Challenge {
-  int64 id = 1 [(gogoproto.moretags) = "gorm:\"primary_key\"", (gogoproto.customname) = "ID"];
-  google.protobuf.Timestamp created_at = 2 [(gogoproto.stdtime) = true, (gogoproto.nullable) = true];
-  google.protobuf.Timestamp updated_at = 3 [(gogoproto.stdtime) = true, (gogoproto.nullable) = true];
+  int64 id = 1 [(gogoproto.moretags) = "gorm:\"primary_key\" yaml:\"id,omitempty\"", (gogoproto.customname) = "ID"];
+  google.protobuf.Timestamp created_at = 2 [(gogoproto.stdtime) = true, (gogoproto.nullable) = true, (gogoproto.moretags) = "yaml:\"created_at,omitempty\""];
+  google.protobuf.Timestamp updated_at = 3 [(gogoproto.stdtime) = true, (gogoproto.nullable) = true, (gogoproto.moretags) = "yaml:\"updated_at,omitempty\""];
 
   string name = 100;
   string description = 101;
@@ -26,13 +26,13 @@ message Challenge {
   // AuthorProfile
   // repeated string tags = ;
 
-  repeated ChallengeFlavor flavors = 200 [(gogoproto.moretags) = "gorm:\"PRELOAD:false\""];
+  repeated ChallengeFlavor flavors = 200 [(gogoproto.moretags) = "gorm:\"PRELOAD:false\" yaml:\"flavors,omitempty\""];
 }
 
 message ChallengeFlavor {
-  int64 id = 1 [(gogoproto.moretags) = "gorm:\"primary_key\"", (gogoproto.customname) = "ID"];
-  google.protobuf.Timestamp created_at = 2 [(gogoproto.stdtime) = true, (gogoproto.nullable) = true];
-  google.protobuf.Timestamp updated_at = 3 [(gogoproto.stdtime) = true, (gogoproto.nullable) = true];
+  int64 id = 1 [(gogoproto.moretags) = "gorm:\"primary_key\" yaml:\"id,omitempty\"", (gogoproto.customname) = "ID"];
+  google.protobuf.Timestamp created_at = 2 [(gogoproto.stdtime) = true, (gogoproto.nullable) = true, (gogoproto.moretags) = "yaml:\"created_at,omitempty\""];
+  google.protobuf.Timestamp updated_at = 3 [(gogoproto.stdtime) = true, (gogoproto.nullable) = true, (gogoproto.moretags) = "yaml:\"updated_at,omitempty\""];
 
   string version = 100;
   string changelog = 101;
@@ -46,10 +46,10 @@ message ChallengeFlavor {
   string slug = 109 [(gogoproto.moretags) = "gorm:\"unique_index\""];
   string body = 110;
 
-  Challenge challenge = 200 [(gogoproto.moretags) = "gorm:\"foreignkey:ChallengeID\""];
-  int64 challenge_id = 201 [(gogoproto.customname) = "ChallengeID", (gogoproto.moretags) = "sql:\"not null\" gorm:\"index\""];
-  repeated SeasonChallenge season_challenges = 202 [(gogoproto.moretags) = "gorm:\"PRELOAD:false;foreignkey:FlavorID\""];
-  repeated ChallengeInstance instances = 203 [(gogoproto.moretags) = "gorm:\"PRELOAD:false;foreignkey:FlavorID\""];
+  Challenge challenge = 200 [(gogoproto.moretags) = "gorm:\"foreignkey:ChallengeID\" yaml:\"challenge,omitempty\""];
+  int64 challenge_id = 201 [(gogoproto.customname) = "ChallengeID", (gogoproto.moretags) = "sql:\"not null\" gorm:\"index\" yaml:\"challenge_id,omitempty\""];
+  repeated SeasonChallenge season_challenges = 202 [(gogoproto.moretags) = "gorm:\"PRELOAD:false;foreignkey:FlavorID\" yaml:\"season_challenges,omitempty\""];
+  repeated ChallengeInstance instances = 203 [(gogoproto.moretags) = "gorm:\"PRELOAD:false;foreignkey:FlavorID\" yaml:\"instances,omitempty\""];
   //repeated ChallengeSubscription subscriptions = 203 [(gogoproto.moretags) = "gorm:\"PRELOAD:false\""];
 
   enum Driver {

diff --git a/challenges/challenge.mk b/challenges/challenge.mk
@@ -18,11 +18,11 @@ pathwar.ps:
 docker.build:
 	docker-compose build --pull
 
-.PHONY: pathwar-prepare
+.PHONY: pathwar.prepare
 pathwar.prepare:
-	pathwar $(PATHWAR_OPTS) compose prepare --prefix=$(PREFIX) --no-push .
+	pathwar $(PATHWAR_OPTS) compose prepare --prefix=$(PREFIX) --no-push . > pathwar-compose.yml
 
-.PHONY: pathwar-push
+.PHONY: pathwar.push
 pathwar.push:
 	pathwar $(PATHWAR_OPTS) compose prepare --prefix=$(PREFIX) .
 

diff --git a/docs/gen.sum b/docs/gen.sum
diff --git a/go/gen.sum b/go/gen.sum
diff --git a/go/pkg/pwcompose/types.go b/go/pkg/pwcompose/types.go
@@ -4,13 +4,18 @@ import (
 	"fmt"
 
 	"github.com/docker/docker/api/types"
+	"pathwar.land/pathwar/v2/go/pkg/pwdb"
 )
 
 type config struct {
 	Version  string
 	Networks map[string]network
 	Volumes  map[string]volume
 	Services map[string]Service
+	XPathwar struct {
+		Challenge pwdb.Challenge       `yaml:"challenge"`
+		Flavor    pwdb.ChallengeFlavor `yaml:"flavor"`
+	} `yaml:"x-pathwar"`
 }
 
 type network struct {