e2e_tests: add OSPolicies tests for package install (#302)

* e2e_tests: add OSPolicies tests for package install * remove binary
GoogleCloudPlatform · Apr 2, 2021 · ea7f2f1 · ea7f2f1
1 parent cfeb07b
commit ea7f2f1
Show file tree

Hide file tree

Showing 19 changed files with 11,477 additions and 13 deletions.
diff --git a/e2e_tests/gcp_clients/gcp_clients.go b/e2e_tests/gcp_clients/gcp_clients.go
@@ -21,19 +21,24 @@ import (
 	osconfigV1beta "cloud.google.com/go/osconfig/apiv1beta"
 	"github.com/GoogleCloudPlatform/compute-image-tools/daisy/compute"
 	"github.com/GoogleCloudPlatform/osconfig/e2e_tests/config"
+	osconfigZonalV1alpha "github.com/GoogleCloudPlatform/osconfig/e2e_tests/internal/cloud.google.com/go/osconfig/apiv1alpha"
 	"google.golang.org/api/option"
 )
 
 var (
-	computeClient        compute.Client
-	osconfigClientV1beta *osconfigV1beta.Client
+	computeClient              compute.Client
+	osconfigClientV1beta       *osconfigV1beta.Client
+	osconfigZonalClientV1alpha *osconfigZonalV1alpha.OsConfigZonalClient
 )
 
 // PopulateClients populates the GCP clients.
 func PopulateClients(ctx context.Context) error {
 	if err := createComputeClient(ctx); err != nil {
 		return err
 	}
+	if err := createOsConfigClientV1Alpha(ctx); err != nil {
+		return err
+	}
 	return createOsConfigClientV1beta(ctx)
 }
 
@@ -49,6 +54,12 @@ func createOsConfigClientV1beta(ctx context.Context) error {
 	return err
 }
 
+func createOsConfigClientV1Alpha(ctx context.Context) error {
+	var err error
+	osconfigZonalClientV1alpha, err = osconfigZonalV1alpha.NewOsConfigZonalClient(ctx, option.WithCredentialsFile(config.OauthPath()), option.WithEndpoint(config.SvcEndpoint()))
+	return err
+}
+
 // GetComputeClient returns a singleton GCP client for osconfig tests
 func GetComputeClient() (compute.Client, error) {
 	if computeClient == nil {
@@ -64,3 +75,11 @@ func GetOsConfigClientV1beta() (*osconfigV1beta.Client, error) {
 	}
 	return osconfigClientV1beta, nil
 }
+
+// GetOsConfigClientV1Alpha returns a singleton GCP client for osconfig tests
+func GetOsConfigClientV1Alpha() (*osconfigZonalV1alpha.OsConfigZonalClient, error) {
+	if osconfigZonalClientV1alpha == nil {
+		return nil, fmt.Errorf("v1alpha osconfig client was not initialized")
+	}
+	return osconfigZonalClientV1alpha, nil
+}
diff --git a/e2e_tests/go.mod b/e2e_tests/go.mod
@@ -3,14 +3,16 @@ module github.com/GoogleCloudPlatform/osconfig/e2e_tests
 go 1.13
 
 require (
-	cloud.google.com/go v0.62.0
-	github.com/GoogleCloudPlatform/compute-image-tools/daisy v0.0.0-20200806162442-cbe93c2f2b04
-	github.com/GoogleCloudPlatform/compute-image-tools/go/e2e_test_utils v0.0.0-20200806162442-cbe93c2f2b04
-	github.com/GoogleCloudPlatform/guest-logging-go v0.0.0-20200113214433-6cbb518174d4
-	github.com/GoogleCloudPlatform/osconfig v0.0.0-20200805223003-f44a6489e0f4
-	github.com/golang/protobuf v1.4.2
+	cloud.google.com/go v0.80.0
+	github.com/GoogleCloudPlatform/compute-image-tools/daisy v0.0.0-20210330220513-8c91d0ad47a2
+	github.com/GoogleCloudPlatform/compute-image-tools/go/e2e_test_utils v0.0.0-20210330220513-8c91d0ad47a2
+	github.com/GoogleCloudPlatform/guest-logging-go v0.0.0-20210218230930-56f7230ae26d
+	github.com/GoogleCloudPlatform/osconfig v0.0.0-20210319194316-1c34f5593716 // indirect
+	github.com/golang/protobuf v1.5.2
+	github.com/googleapis/gax-go/v2 v2.0.5 // indirect
 	github.com/kylelemons/godebug v1.1.0
-	google.golang.org/api v0.30.0
-	google.golang.org/genproto v0.0.0-20200804151602-45615f50871c
-	google.golang.org/grpc v1.31.0
+	google.golang.org/api v0.43.0
+	google.golang.org/genproto v0.0.0-20210331142528-b7513248f0ba
+	google.golang.org/grpc v1.36.1
+	google.golang.org/protobuf v1.26.0 // indirect
 )
diff --git a/e2e_tests/go.sum b/e2e_tests/go.sum
diff --git a/e2e_tests/internal/cloud.google.com/go/osconfig/apiv1alpha/doc.go b/e2e_tests/internal/cloud.google.com/go/osconfig/apiv1alpha/doc.go
diff --git a/e2e_tests/internal/cloud.google.com/go/osconfig/apiv1alpha/gapic_metadata.json b/e2e_tests/internal/cloud.google.com/go/osconfig/apiv1alpha/gapic_metadata.json
@@ -0,0 +1,78 @@
+{
+  "schema":  "1.0",
+  "comment":  "This file maps proto services/RPCs to the corresponding library clients/methods.",
+  "language":  "go",
+  "protoPackage":  "google.cloud.osconfig.v1alpha",
+  "libraryPackage":  "cloud.google.com/go/osconfig/apiv1alpha",
+  "services":  {
+    "OsConfigZonalService":  {
+      "clients":  {
+        "grpc":  {
+          "libraryClient":  "OsConfigZonalClient",
+          "rpcs":  {
+            "CreateOSPolicyAssignment":  {
+              "methods":  [
+                "CreateOSPolicyAssignment"
+              ]
+            },
+            "DeleteOSPolicyAssignment":  {
+              "methods":  [
+                "DeleteOSPolicyAssignment"
+              ]
+            },
+            "GetInstanceOSPoliciesCompliance":  {
+              "methods":  [
+                "GetInstanceOSPoliciesCompliance"
+              ]
+            },
+            "GetInventory":  {
+              "methods":  [
+                "GetInventory"
+              ]
+            },
+            "GetOSPolicyAssignment":  {
+              "methods":  [
+                "GetOSPolicyAssignment"
+              ]
+            },
+            "GetVulnerabilityReport":  {
+              "methods":  [
+                "GetVulnerabilityReport"
+              ]
+            },
+            "ListInstanceOSPoliciesCompliances":  {
+              "methods":  [
+                "ListInstanceOSPoliciesCompliances"
+              ]
+            },
+            "ListInventories":  {
+              "methods":  [
+                "ListInventories"
+              ]
+            },
+            "ListOSPolicyAssignmentRevisions":  {
+              "methods":  [
+                "ListOSPolicyAssignmentRevisions"
+              ]
+            },
+            "ListOSPolicyAssignments":  {
+              "methods":  [
+                "ListOSPolicyAssignments"
+              ]
+            },
+            "ListVulnerabilityReports":  {
+              "methods":  [
+                "ListVulnerabilityReports"
+              ]
+            },
+            "UpdateOSPolicyAssignment":  {
+              "methods":  [
+                "UpdateOSPolicyAssignment"
+              ]
+            }
+          }
+        }
+      }
+    }
+  }
+}