Secret API resource

pkg/client/client.go

@@ -40,6 +40,7 @@ type Interface interface {
 	LimitRangesNamespacer
 	ResourceQuotasNamespacer
 	ResourceQuotaUsagesNamespacer
+	SecretsNamespacer
 	NamespacesInterface
 }
 
@@ -79,6 +80,10 @@ func (c *Client) ResourceQuotaUsages(namespace string) ResourceQuotaUsageInterfa
 	return newResourceQuotaUsages(c, namespace)
 }
 
+func (c *Client) Secrets(namespace string) SecretsInterface {
+	return newSecrets(c, namespace)
+}
+
 func (c *Client) Namespaces() NamespaceInterface {
 	return newNamespaces(c)
 }

pkg/client/fake.go

@@ -45,6 +45,8 @@ type Fake struct {
 	LimitRangesList    api.LimitRangeList
 	ResourceQuotasList api.ResourceQuotaList
 	NamespacesList     api.NamespaceList
+	SecretList         api.SecretList
+	Secret             api.Secret
 	Err                error
 	Watch              watch.Interface
 }
@@ -85,6 +87,10 @@ func (c *Fake) Services(namespace string) ServiceInterface {
 	return &FakeServices{Fake: c, Namespace: namespace}
 }
 
+func (c *Fake) Secrets(namespace string) SecretsInterface {
+	return &FakeSecrets{Fake: c, Namespace: namespace}
+}
+
 func (c *Fake) Namespaces() NamespaceInterface {
 	return &FakeNamespaces{Fake: c}
 }

pkg/client/fake_secrets.go

@@ -0,0 +1,60 @@
+/*
+Copyright 2014 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package client
+
+import (
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/watch"
+)
+
+// Fake implements SecretInterface. Meant to be embedded into a struct to get a default
+// implementation. This makes faking out just the method you want to test easier.
+type FakeSecrets struct {
+	Fake      *Fake
+	Namespace string
+}
+
+func (c *FakeSecrets) List(labels, fields labels.Selector) (*api.SecretList, error) {
+	c.Fake.Actions = append(c.Fake.Actions, FakeAction{Action: "list-secrets"})
+	return &c.Fake.SecretList, c.Fake.Err
+}
+
+func (c *FakeSecrets) Get(name string) (*api.Secret, error) {
+	c.Fake.Actions = append(c.Fake.Actions, FakeAction{Action: "get-secret", Value: name})
+	return api.Scheme.CopyOrDie(&c.Fake.Secret).(*api.Secret), nil
+}
+
+func (c *FakeSecrets) Create(secret *api.Secret) (*api.Secret, error) {
+	c.Fake.Actions = append(c.Fake.Actions, FakeAction{Action: "create-secret", Value: secret})
+	return &api.Secret{}, nil
+}
+
+func (c *FakeSecrets) Update(secret *api.Secret) (*api.Secret, error) {
+	c.Fake.Actions = append(c.Fake.Actions, FakeAction{Action: "update-secret", Value: secret})
+	return &api.Secret{}, nil
+}
+
+func (c *FakeSecrets) Delete(secret string) error {
+	c.Fake.Actions = append(c.Fake.Actions, FakeAction{Action: "delete-secret", Value: secret})
+	return nil
+}
+
+func (c *FakeSecrets) Watch(label, field labels.Selector, resourceVersion string) (watch.Interface, error) {
+	c.Fake.Actions = append(c.Fake.Actions, FakeAction{Action: "watch-secrets", Value: resourceVersion})
+	return c.Fake.Watch, c.Fake.Err
+}

pkg/client/secrets.go

@@ -0,0 +1,140 @@
+/*
+Copyright 2015 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package client
+
+import (
+	"errors"
+	"fmt"
+
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/watch"
+)
+
+type SecretsNamespacer interface {
+	Secrets(namespace string) SecretsInterface
+}
+
+type SecretsInterface interface {
+	Create(secret *api.Secret) (*api.Secret, error)
+	Update(secret *api.Secret) (*api.Secret, error)
+	Delete(name string) error
+	List(label, field labels.Selector) (*api.SecretList, error)
+	Get(name string) (*api.Secret, error)
+	Watch(label, field labels.Selector, resourceVersion string) (watch.Interface, error)
+}
+
+// events implements Secrets interface
+type secrets struct {
+	client    *Client
+	namespace string
+}
+
+// newSecrets returns a new secrets object.
+func newSecrets(c *Client, ns string) *secrets {
+	return &secrets{
+		client:    c,
+		namespace: ns,
+	}
+}
+
+func (s *secrets) Create(secret *api.Secret) (*api.Secret, error) {
+	if s.namespace != "" && secret.Namespace != s.namespace {
+		return nil, fmt.Errorf("can't create a secret with namespace '%v' in namespace '%v'", secret.Namespace, s.namespace)
+	}
+
+	result := &api.Secret{}
+	err := s.client.Post().
+		Namespace(secret.Namespace).
+		Resource("secrets").
+		Body(secret).
+		Do().
+		Into(result)
+
+	return result, err
+}
+
+// List returns a list of secrets matching the selectors.
+func (s *secrets) List(label, field labels.Selector) (*api.SecretList, error) {
+	result := &api.SecretList{}
+
+	err := s.client.Get().
+		Namespace(s.namespace).
+		Resource("secrets").
+		SelectorParam("labels", label).
+		SelectorParam("fields", field).
+		Do().
+		Into(result)
+
+	return result, err
+}
+
+// Get returns the given secret, or an error.
+func (s *secrets) Get(name string) (*api.Secret, error) {
+	if len(name) == 0 {
+		return nil, errors.New("name is required parameter to Get")
+	}
+
+	result := &api.Secret{}
+	err := s.client.Get().
+		Namespace(s.namespace).
+		Resource("secrets").
+		Name(name).
+		Do().
+		Into(result)
+
+	return result, err
+}
+
+// Watch starts watching for secrets matching the given selectors.
+func (s *secrets) Watch(label, field labels.Selector, resourceVersion string) (watch.Interface, error) {
+	return s.client.Get().
+		Prefix("watch").
+		Namespace(s.namespace).
+		Resource("secrets").
+		Param("resourceVersion", resourceVersion).
+		SelectorParam("labels", label).
+		SelectorParam("fields", field).
+		Watch()
+}
+
+func (s *secrets) Delete(name string) error {
+	return s.client.Delete().
+		Namespace(s.namespace).
+		Resource("secrets").
+		Name(name).
+		Do().
+		Error()
+}
+
+func (s *secrets) Update(secret *api.Secret) (result *api.Secret, err error) {
+	result = &api.Secret{}
+	if len(secret.ResourceVersion) == 0 {
+		err = fmt.Errorf("invalid update object, missing resource version: %v", secret)
+		return
+	}
+
+	err = s.client.Put().
+		Namespace(s.namespace).
+		Resource("secrets").
+		Name(secret.Name).
+		Body(secret).
+		Do().
+		Into(result)
+
+	return
+}