Merge pull request #2 from grafeas/master

Merge from Master

CHANGELOG.md

@@ -1,6 +1,9 @@
 This is the changelog of Grafeas server releases. For more information on
 versionining, see [versioning](docs/versioning.md) document.
 
+v0.1.2:
+  * Support for multiple storage implementations.
+
 v0.1.1:
   * Grafeas helm chart is compliant with stable requirements.
   * Code cleanup.

README.md

@@ -15,6 +15,7 @@ control of different types of metadata.
 
 ## Getting Started
 
+* Watch the talk on [Software Supply Chain Management with Grafeas and Kritis](https://www.infoq.com/presentations/supply-grafeas-kritis/)
 * Read the Grafeas [announcement](https://grafeas.io/blog/introducing-grafeas)
 * Learn the [Grafeas concepts](docs/grafeas_concepts.md) and [core design
   principles](docs/design_principles.md)

go/v1/api/occurrence.go

@@ -261,7 +261,12 @@ func (g *API) ListNoteOccurrences(ctx context.Context, req *gpb.ListNoteOccurren
 		return err
 	}
 
-	occs, npt, err := g.Storage.ListNoteOccurrences(ctx, pID, nID, req.Filter, req.PageToken, req.PageSize)
+	ps, err := validatePageSize(req.PageSize)
+	if err != nil {
+		return err
+	}
+
+	occs, npt, err := g.Storage.ListNoteOccurrences(ctx, pID, nID, req.Filter, req.PageToken, ps)
 	if err != nil {
 		return err
 	}

go/v1/api/occurrence_test.go

@@ -703,6 +703,7 @@ func TestListNoteOccurrencesErrors(t *testing.T) {
 	tests := []struct {
 		desc                        string
 		noteName                    string
+		pageSize                    int32
 		internalStorageErr, authErr bool
 		wantErrStatus               codes.Code
 	}{
@@ -723,6 +724,12 @@ func TestListNoteOccurrencesErrors(t *testing.T) {
 			internalStorageErr: true,
 			wantErrStatus:      codes.Internal,
 		},
+		{
+			desc:          "invalid page size error",
+			noteName:      "projects/goog-vulnz/notes/CVE-UH-OH",
+			pageSize:      -1,
+			wantErrStatus: codes.InvalidArgument,
+		},
 	}
 
 	for _, tt := range tests {
@@ -735,7 +742,8 @@ func TestListNoteOccurrencesErrors(t *testing.T) {
 		}
 
 		req := &gpb.ListNoteOccurrencesRequest{
-			Name: tt.noteName,
+			Name:     tt.noteName,
+			PageSize: tt.pageSize,
 		}
 		resp := &gpb.ListNoteOccurrencesResponse{}
 		err := g.ListNoteOccurrences(ctx, req, resp)

go/v1/filter/filter.go

@@ -1,4 +1,4 @@
-// Package filter handles filtering the results of list methods.
+// Package filter handles filtering the results of methods that support filtering.
 package filter
 
 import (
@@ -16,11 +16,11 @@ type Resource interface{}
 //
 // The base resource name
 // (https://cloud.google.com/apis/design/resource_names#relative_resource_name) is an optional
-// dimension the filter works on. For example it could be the project name if the list method this
-// filter handler is for acts on a project level.
+// dimension the filter works on. For example it could be the project name if the method this filter
+// handler is for acts on a project level.
 type Handler func(ctx context.Context, baseResourceName, filter, pageToken string, pageSize int32) (Resource, string, bool, error)
 
-// Filterer holds functions on how to handle various filter patterns for listing resources.
+// Filterer holds functions on how to handle various filter patterns for filtering resources.
 type Filterer struct {
 	// Handlers contain all functions that handle specific filter patterns.
 	Handlers []Handler

grafeas-charts/Chart.yaml

@@ -2,5 +2,5 @@ apiVersion: v1
 appVersion: "v0.1.0"
 description: A Helm chart for Kubernetes
 name: grafeas-charts
-version: 0.1.1
+version: 0.1.2
 icon: https://raw.githubusercontent.com/grafeas/grafeas/master/logo/grafeas-logo-128.png

grafeas-charts/templates/secrets.yaml

@@ -1,3 +1,5 @@
+{{- if .Values.secret.enabled }}
+---
 apiVersion: v1
 kind: Secret
 metadata:
@@ -11,4 +13,5 @@ type: Opaque
 data:
   ca.crt: {{ .Values.certificates.ca | b64enc }}
   server.crt : {{ .Values.certificates.cert | b64enc }}
-  server.key: {{ .Values.certificates.key | b64enc }}
+  server.key: {{ .Values.certificates.key | b64enc }}
+{{- end }}

grafeas-charts/values.yaml

@@ -1,9 +1,12 @@
 replicaCount: 1
 
+secret:
+  enabled: false
+
 image:
   repository: us.gcr.io/grafeas
   name: grafeas-server
-  tag: v0.1.1
+  tag: v0.1.2
   pullPolicy: IfNotPresent
 
 nameOverride: "grafeas-server"