Xds again (#66)

* fix xds gen * generate code * remove mistake * 15min timeout
solo-io · Jan 15, 2019 · d46d502 · d46d502
1 parent 2b6a8b2
commit d46d502
Show file tree

Hide file tree

Showing 12 changed files with 390 additions and 140 deletions.
diff --git a/cloudbuild.yaml b/cloudbuild.yaml
@@ -37,4 +37,6 @@ steps:
       - 'PROJECT_ROOT=github.com/solo-io/solo-kit'
       - 'GOPATH=/workspace/gopath'
     id: 'build-codegen'
-    waitFor: ['test']
+    waitFor: ['test']
+
+timeout: 900s
diff --git a/pkg/api/v1/apiserver/api_server.pb.go b/pkg/api/v1/apiserver/api_server.pb.go
diff --git a/pkg/api/v1/clients/kube/crd/client/clientset/versioned/fake/register.go b/pkg/api/v1/clients/kube/crd/client/clientset/versioned/fake/register.go
diff --git a/pkg/api/v1/resources/core/metadata.pb.go b/pkg/api/v1/resources/core/metadata.pb.go
diff --git a/pkg/api/v1/resources/core/ref.pb.go b/pkg/api/v1/resources/core/ref.pb.go
diff --git a/pkg/api/v1/resources/core/solo-kit.pb.go b/pkg/api/v1/resources/core/solo-kit.pb.go
diff --git a/pkg/api/v1/resources/core/status.pb.go b/pkg/api/v1/resources/core/status.pb.go
diff --git a/pkg/code-generator/codegen/templates/xds_template.go b/pkg/code-generator/codegen/templates/xds_template.go
@@ -23,7 +23,7 @@ import (
 
 // Type Definitions:
 
-const {{ upper_camel .MessageType }}Type = cache.TypePrefix + "/{{ .Package }}.{{ upper_camel .MessageType }}"
+const {{ upper_camel .MessageType }}Type = cache.TypePrefix + "/{{ .ProtoPackage }}.{{ upper_camel .MessageType }}"
 
 /* Defined a resource - to be used by snapshot */
 type {{ upper_camel .MessageType }}XdsResourceWrapper struct {

diff --git a/...pi/doc/github.com/solo-io/solo-kit/test/mocks/api/v1/mock_resources.proto.sk.md b/...pi/doc/github.com/solo-io/solo-kit/test/mocks/api/v1/mock_resources.proto.sk.md
diff --git a/test/mocks/api/v1/mock_resources.proto b/test/mocks/api/v1/mock_resources.proto
@@ -16,6 +16,9 @@ go_package Comments a
 */
 option go_package = "github.com/solo-io/solo-kit/test/mocks/v1";
 
+import "envoy/api/v2/discovery.proto";
+import "google/api/annotations.proto";
+
 /*
 go_package Comments
 go_package Comments a
@@ -61,3 +64,31 @@ message FakeResource {
     uint32 count = 1;
     core.solo.io.Metadata metadata = 7 [(gogoproto.nullable) = false];
 }
+
+/*
+@solo-kit:xds-service=MockXdsResourceDiscoveryService
+@solo-kit:resource.no_references
+*/
+message MockXdsResourceConfig {
+    // @solo-kit:resource.name
+    string domain = 1;
+}
+
+/*
+@solo-kit:resource.xds-enabled
+*/
+service MockXdsResourceDiscoveryService {
+    rpc StreamMockXdsResourceConfig(stream envoy.api.v2.DiscoveryRequest) returns (stream envoy.api.v2.DiscoveryResponse) {
+    }
+
+    rpc IncrementalMockXdsResourceConfig(stream envoy.api.v2.IncrementalDiscoveryRequest)
+        returns (stream envoy.api.v2.IncrementalDiscoveryResponse) {
+    }
+
+    rpc FetchMockXdsResourceConfig(envoy.api.v2.DiscoveryRequest) returns (envoy.api.v2.DiscoveryResponse) {
+        option (google.api.http) = {
+        post: "/v2/discovery:mockxdsresourceconfig"
+        body: "*"
+        };
+    }
+}