Merge branch 'master' of /Users/jake/terraform

Author: grubernaut

gitlab/config.go

@@ -0,0 +1,31 @@
+package gitlab
+
+import (
+	"github.com/xanzy/go-gitlab"
+)
+
+// Config is per-provider, specifies where to connect to gitlab
+type Config struct {
+	Token   string
+	BaseURL string
+}
+
+// Client returns a *gitlab.Client to interact with the configured gitlab instance
+func (c *Config) Client() (interface{}, error) {
+	client := gitlab.NewClient(nil, c.Token)
+	if c.BaseURL != "" {
+		err := client.SetBaseURL(c.BaseURL)
+		if err != nil {
+			// The BaseURL supplied wasn't valid, bail.
+			return nil, err
+		}
+	}
+
+	// Test the credentials by checking we can get information about the authenticated user.
+	_, _, err := client.Users.CurrentUser()
+	if err != nil {
+		return nil, err
+	}
+
+	return client, nil
+}

gitlab/provider.go

@@ -0,0 +1,55 @@
+package gitlab
+
+import (
+	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform/terraform"
+)
+
+// Provider returns a terraform.ResourceProvider.
+func Provider() terraform.ResourceProvider {
+
+	// The actual provider
+	return &schema.Provider{
+		Schema: map[string]*schema.Schema{
+			"token": {
+				Type:        schema.TypeString,
+				Required:    true,
+				DefaultFunc: schema.EnvDefaultFunc("GITLAB_TOKEN", nil),
+				Description: descriptions["token"],
+			},
+			"base_url": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				DefaultFunc: schema.EnvDefaultFunc("GITLAB_BASE_URL", ""),
+				Description: descriptions["base_url"],
+			},
+		},
+		ResourcesMap: map[string]*schema.Resource{
+			"gitlab_group":        resourceGitlabGroup(),
+			"gitlab_project":      resourceGitlabProject(),
+			"gitlab_project_hook": resourceGitlabProjectHook(),
+			"gitlab_deploy_key":   resourceGitlabDeployKey(),
+		},
+
+		ConfigureFunc: providerConfigure,
+	}
+}
+
+var descriptions map[string]string
+
+func init() {
+	descriptions = map[string]string{
+		"token": "The OAuth token used to connect to GitLab.",
+
+		"base_url": "The GitLab Base API URL",
+	}
+}
+
+func providerConfigure(d *schema.ResourceData) (interface{}, error) {
+	config := Config{
+		Token:   d.Get("token").(string),
+		BaseURL: d.Get("base_url").(string),
+	}
+
+	return config.Client()
+}

gitlab/provider_test.go

@@ -0,0 +1,35 @@
+package gitlab
+
+import (
+	"os"
+	"testing"
+
+	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform/terraform"
+)
+
+var testAccProviders map[string]terraform.ResourceProvider
+var testAccProvider *schema.Provider
+
+func init() {
+	testAccProvider = Provider().(*schema.Provider)
+	testAccProviders = map[string]terraform.ResourceProvider{
+		"gitlab": testAccProvider,
+	}
+}
+
+func TestProvider(t *testing.T) {
+	if err := Provider().(*schema.Provider).InternalValidate(); err != nil {
+		t.Fatalf("err: %s", err)
+	}
+}
+
+func TestProvider_impl(t *testing.T) {
+	var _ terraform.ResourceProvider = Provider()
+}
+
+func testAccPreCheck(t *testing.T) {
+	if v := os.Getenv("GITLAB_TOKEN"); v == "" {
+		t.Fatal("GITLAB_TOKEN must be set for acceptance tests")
+	}
+}

gitlab/resource_gitlab_deploy_key.go

@@ -0,0 +1,107 @@
+package gitlab
+
+import (
+	"fmt"
+	"log"
+	"strconv"
+
+	"github.com/hashicorp/terraform/helper/schema"
+	gitlab "github.com/xanzy/go-gitlab"
+)
+
+func resourceGitlabDeployKey() *schema.Resource {
+	return &schema.Resource{
+		Create: resourceGitlabDeployKeyCreate,
+		Read:   resourceGitlabDeployKeyRead,
+		Delete: resourceGitlabDeployKeyDelete,
+
+		Schema: map[string]*schema.Schema{
+			"project": {
+				Type:     schema.TypeString,
+				Required: true,
+				ForceNew: true,
+			},
+			"title": {
+				Type:     schema.TypeString,
+				Required: true,
+				ForceNew: true,
+			},
+			"key": {
+				Type:     schema.TypeString,
+				Required: true,
+				ForceNew: true,
+			},
+			"can_push": {
+				Type:     schema.TypeBool,
+				Optional: true,
+				Default:  false,
+				ForceNew: true,
+			},
+		},
+	}
+}
+
+func resourceGitlabDeployKeyCreate(d *schema.ResourceData, meta interface{}) error {
+	client := meta.(*gitlab.Client)
+	project := d.Get("project").(string)
+	options := &gitlab.AddDeployKeyOptions{
+		Title:   gitlab.String(d.Get("title").(string)),
+		Key:     gitlab.String(d.Get("key").(string)),
+		CanPush: gitlab.Bool(d.Get("can_push").(bool)),
+	}
+
+	log.Printf("[DEBUG] create gitlab deployment key %s", *options.Title)
+
+	deployKey, _, err := client.DeployKeys.AddDeployKey(project, options)
+	if err != nil {
+		return err
+	}
+
+	d.SetId(fmt.Sprintf("%d", deployKey.ID))
+
+	return resourceGitlabDeployKeyRead(d, meta)
+}
+
+func resourceGitlabDeployKeyRead(d *schema.ResourceData, meta interface{}) error {
+	client := meta.(*gitlab.Client)
+	project := d.Get("project").(string)
+	deployKeyID, err := strconv.Atoi(d.Id())
+	if err != nil {
+		return err
+	}
+	log.Printf("[DEBUG] read gitlab deploy key %s/%d", project, deployKeyID)
+
+	deployKey, response, err := client.DeployKeys.GetDeployKey(project, deployKeyID)
+	if err != nil {
+		if response.StatusCode == 404 {
+			log.Printf("[WARN] removing deploy key %d from state because it no longer exists in gitlab", deployKeyID)
+			d.SetId("")
+			return nil
+		}
+
+		return err
+	}
+
+	d.Set("title", deployKey.Title)
+	d.Set("key", deployKey.Key)
+	d.Set("can_push", deployKey.CanPush)
+	return nil
+}
+
+func resourceGitlabDeployKeyDelete(d *schema.ResourceData, meta interface{}) error {
+	client := meta.(*gitlab.Client)
+	project := d.Get("project").(string)
+	deployKeyID, err := strconv.Atoi(d.Id())
+	if err != nil {
+		return err
+	}
+	log.Printf("[DEBUG] Delete gitlab deploy key %s", d.Id())
+
+	response, err := client.DeployKeys.DeleteDeployKey(project, deployKeyID)
+
+	// HTTP 204 is success with no body
+	if response.StatusCode == 204 {
+		return nil
+	}
+	return err
+}