Flatten packages

Author: dpavlotzky

creds/creds.go renamed to creds.go

@@ -1,4 +1,4 @@
-package creds
+package transip
 
 import (
 	"crypto/rsa"

soap/decode.go renamed to decode.go

@@ -1,7 +1,7 @@
 // Package soap implements SOAP-logic for the TransIP API.
 // decode.go contains the logic to convert the XML to the corresponding
 // datastructures
-package soap
+package transip
 
 import (
 	"bytes"

domainservice.go

@@ -4,33 +4,30 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-	"github.com/mpdroog/transip/creds"
-	"github.com/mpdroog/transip/soap"
-	"github.com/mpdroog/transip/soap/signature"
 	"strconv"
 )
 
 const domainService = "DomainService"
 
 type DomainService struct {
-	Creds creds.Client
+	Creds Client
 }
 
-func (c *DomainService) DomainNames() (*soap.DomainNames, error) {
-	rawbody, e := soap.Lookup(c.Creds, soap.Request{Service: domainService, Method: "getDomainNames", Body: `<ns1:getDomainNames/>`})
+func (c *DomainService) DomainNames() (*DomainNames, error) {
+	rawbody, e := Lookup(c.Creds, Request{Service: domainService, Method: "getDomainNames", Body: `<ns1:getDomainNames/>`})
 	if e != nil {
 		return nil, e
 	}
 
-	domains := &soap.DomainNames{}
-	e = soap.Decode(rawbody, &domains)
+	domains := &DomainNames{}
+	e = Decode(rawbody, &domains)
 	return domains, e
 }
 
-func (c *DomainService) Domain(name string) (*soap.Domain, error) {
-	rawbody, e := soap.Lookup(c.Creds, soap.Request{
+func (c *DomainService) Domain(name string) (*Domain, error) {
+	rawbody, e := Lookup(c.Creds, Request{
 		Service: domainService,
-		ExtraParams: []signature.KV{
+		ExtraParams: []KV{
 			{Key: "0", Value: name},
 		},
 		Method: "getInfo",
@@ -40,24 +37,24 @@ func (c *DomainService) Domain(name string) (*soap.Domain, error) {
 		return nil, e
 	}
 
-	domain := &soap.Domain{}
-	e = soap.Decode(rawbody, &domain)
+	domain := &Domain{}
+	e = Decode(rawbody, &domain)
 	return domain, e
 }
 
-func (c *DomainService) Domains(names []string) ([]soap.Domain, error) {
+func (c *DomainService) Domains(names []string) ([]Domain, error) {
 	entryTemplate := `<item xsi:type="xsd:string">%s</item>`
-	params := []signature.KV{}
+	params := []KV{}
 	xml := ``
 
 	for idx, v := range names {
 		xml = xml + fmt.Sprintf(entryTemplate, v)
-		params = append(params, []signature.KV{
+		params = append(params, []KV{
 			{Key: fmt.Sprintf("0[%d]", idx), Value: v},
 		}...)
 	}
 
-	rawbody, e := soap.Lookup(c.Creds, soap.Request{
+	rawbody, e := Lookup(c.Creds, Request{
 		Service:     domainService,
 		ExtraParams: params,
 		Method:      "batchGetInfo",
@@ -67,30 +64,30 @@ func (c *DomainService) Domains(names []string) ([]soap.Domain, error) {
 		return nil, e
 	}
 
-	domains := &soap.Domains{}
-	e = soap.Decode(rawbody, &domains)
+	domains := &Domains{}
+	e = Decode(rawbody, &domains)
 	return domains.Domains, e
 }
 
-func (c *DomainService) SetDNSEntries(domain string, entries []soap.DomainDNSentry) error {
+func (c *DomainService) SetDNSEntries(domain string, entries []DomainDNSentry) error {
 	entryTemplate := `<item xsi:type="ns1:DnsEntry"><name xsi:type="xsd:string">%s</name><expire xsi:type="xsd:int">%d</expire><type xsi:type="xsd:string">%s</type><content xsi:type="xsd:string">%s</content></item>`
 
-	params := []signature.KV{
+	params := []KV{
 		{Key: "0", Value: domain},
 	}
 	xml := ``
 
 	for idx, entry := range entries {
 		xml = xml + fmt.Sprintf(entryTemplate, entry.Name, entry.Expire, entry.Type, entry.Content)
-		params = append(params, []signature.KV{
+		params = append(params, []KV{
 			{fmt.Sprintf("1[%d][name]", idx), entry.Name},
 			{fmt.Sprintf("1[%d][expire]", idx), strconv.Itoa(entry.Expire)},
 			{fmt.Sprintf("1[%d][type]", idx), entry.Type},
 			{fmt.Sprintf("1[%d][content]", idx), entry.Content},
 		}...)
 	}
 
-	rawbody, e := soap.Lookup(c.Creds, soap.Request{
+	rawbody, e := Lookup(c.Creds, Request{
 		Service:     domainService,
 		ExtraParams: params,
 		Method:      "setDnsEntries",

soap/signature/signature.go renamed to signature.go

@@ -1,6 +1,6 @@
 // Package signature creates a cookie signature to validate
 // a request for the TransIP API
-package signature
+package transip
 
 import (
 	"crypto"

soap/signature/signature_test.go renamed to signature_test.go

@@ -1,4 +1,4 @@
-package signature
+package transip
 
 import (
 	"bytes"
@@ -115,4 +115,4 @@ u7Isy/Q8xjHsJG6KP2/pMvMG42lhB3b+GKSmxVM999U30SdgorE3Kw==
 	block, _ := pem.Decode(keyContents)
 	privKey,_ := x509.ParsePKCS1PrivateKey(block.Bytes)
 	return privKey
-}
+}

soap/soap.go renamed to soap.go

@@ -1,5 +1,5 @@
 // Package soap implements SOAP-logic for the TransIP API.
-package soap
+package transip
 
 import (
 	"crypto/tls"
@@ -9,10 +9,7 @@ import (
 	"net/http"
 	"strings"
 	"time"
-
 	"fmt"
-	"github.com/mpdroog/transip/creds"
-	"github.com/mpdroog/transip/soap/signature"
 	"strconv"
 )
 
@@ -33,12 +30,12 @@ func uniqid() string {
 
 type Request struct {
 	Service     string         // Service to call on TransIP side
-	ExtraParams []signature.KV // Additional params for the signature-code
+	ExtraParams []KV // Additional params for the signature-code
 	Body        string         // XML body to send in envelope
 	Method      string         // Method to call on service
 }
 
-func Lookup(c creds.Client, in Request) ([]byte, error) {
+func Lookup(c Client, in Request) ([]byte, error) {
 	raw := fmt.Sprintf(`<?xml version="1.0" encoding="UTF-8"?>
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
 	xmlns:ns1="%s" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
@@ -86,14 +83,14 @@ func Lookup(c creds.Client, in Request) ([]byte, error) {
 	})
 
 	kv := in.ExtraParams
-	kv = append(kv, []signature.KV{
+	kv = append(kv, []KV{
 		{"__method", in.Method},
 		{"__service", in.Service},
 		{"__hostname", API_URL},
 		{"__timestamp", now},
 		{"__nonce", nonce}}...,
 	)
-	sig, e := signature.Sign(c.PrivateKey, kv)
+	sig, e := Sign(c.PrivateKey, kv)
 	if e != nil {
 		return []byte{}, e
 	}

soap/signature/urlencode.go renamed to urlencode.go

@@ -1,4 +1,4 @@
-package signature
+package transip
 
 import (
 	"bytes"