@@ -2,8 +2,10 @@

 package awslogs

 import (

+	"errors"

 	"fmt"

 	"os"

+	"runtime"

 	"sort"

 	"strings"

 	"sync"

@@ -12,8 +14,12 @@ import (

 	"github.com/Sirupsen/logrus"

 	"github.com/aws/aws-sdk-go/aws"

 	"github.com/aws/aws-sdk-go/aws/awserr"

+	"github.com/aws/aws-sdk-go/aws/defaults"

+	"github.com/aws/aws-sdk-go/aws/ec2metadata"

+	"github.com/aws/aws-sdk-go/aws/request"

 	"github.com/aws/aws-sdk-go/service/cloudwatchlogs"

 	"github.com/docker/docker/daemon/logger"

+	"github.com/docker/docker/version"

 )

 const (

@@ -35,6 +41,8 @@ const (

 	resourceAlreadyExistsCode = "ResourceAlreadyExistsException"

 	dataAlreadyAcceptedCode   = "DataAlreadyAcceptedException"

 	invalidSequenceTokenCode  = "InvalidSequenceTokenException"

+

+	userAgentHeader = "User-Agent"

 )

 type logStream struct {

@@ -52,12 +60,16 @@ type api interface {

 	PutLogEvents(*cloudwatchlogs.PutLogEventsInput) (*cloudwatchlogs.PutLogEventsOutput, error)

 }

+type regionFinder interface {

+	Region() (string, error)

+}

+

 type byTimestamp []*cloudwatchlogs.InputLogEvent

 // init registers the awslogs driver and sets the default region, if provided

 func init() {

 	if os.Getenv(regionEnvKey) != "" {

-		aws.DefaultConfig.Region = aws.String(os.Getenv(regionEnvKey))

+		defaults.DefaultConfig.Region = aws.String(os.Getenv(regionEnvKey))

 	}

 	if err := logger.RegisterLogDriver(name, New); err != nil {

 		logrus.Fatal(err)

@@ -79,19 +91,17 @@ func New(ctx logger.Context) (logger.Logger, error) {

 	if ctx.Config[logStreamKey] != "" {

 		logStreamName = ctx.Config[logStreamKey]

 	}

-	config := aws.DefaultConfig

-	if ctx.Config[regionKey] != "" {

-		config = aws.DefaultConfig.Merge(&aws.Config{

-			Region: aws.String(ctx.Config[regionKey]),

-		})

+	client, err := newAWSLogsClient(ctx)

+	if err != nil {

+		return nil, err

 	}

 	containerStream := &logStream{

 		logStreamName: logStreamName,

 		logGroupName:  logGroupName,

-		client:        cloudwatchlogs.New(config),

+		client:        client,

 		messages:      make(chan *logger.Message, 4096),

 	}

-	err := containerStream.create()

+	err = containerStream.create()

 	if err != nil {

 		return nil, err

 	}

@@ -100,6 +110,52 @@ func New(ctx logger.Context) (logger.Logger, error) {

 	return containerStream, nil

 }

+// newRegionFinder is a variable such that the implementation

+// can be swapped out for unit tests.

+var newRegionFinder = func() regionFinder {

+	return ec2metadata.New(nil)

+}

+

+// newAWSLogsClient creates the service client for Amazon CloudWatch Logs.

+// Customizations to the default client from the SDK include a Docker-specific

+// User-Agent string and automatic region detection using the EC2 Instance

+// Metadata Service when region is otherwise unspecified.

+func newAWSLogsClient(ctx logger.Context) (api, error) {

+	config := defaults.DefaultConfig

+	if ctx.Config[regionKey] != "" {

+		config = defaults.DefaultConfig.Merge(&aws.Config{

+			Region: aws.String(ctx.Config[regionKey]),

+		})

+	}

+	if config.Region == nil || *config.Region == "" {

+		logrus.Info("Trying to get region from EC2 Metadata")

+		ec2MetadataClient := newRegionFinder()

+		region, err := ec2MetadataClient.Region()

+		if err != nil {

+			logrus.WithFields(logrus.Fields{

+				"error": err,

+			}).Error("Could not get region from EC2 metadata, environment, or log option")

+			return nil, errors.New("Cannot determine region for awslogs driver")

+		}

+		config.Region = &region

+	}

+	logrus.WithFields(logrus.Fields{

+		"region": *config.Region,

+	}).Debug("Created awslogs client")

+	client := cloudwatchlogs.New(config)

+

+	client.Handlers.Build.PushBackNamed(request.NamedHandler{

+		Name: "DockerUserAgentHandler",

+		Fn: func(r *request.Request) {

+			currentAgent := r.HTTPRequest.Header.Get(userAgentHeader)

+			r.HTTPRequest.Header.Set(userAgentHeader,

+				fmt.Sprintf("Docker %s (%s) %s",

+					version.VERSION, runtime.GOOS, currentAgent))

+		},

+	})

+	return client, nil

+}

+

 // Name returns the name of the awslogs logging driver

 func (l *logStream) Name() string {

 	return name

@@ -291,12 +347,6 @@ func ValidateLogOpt(cfg map[string]string) error {

 	if cfg[logGroupKey] == "" {

 		return fmt.Errorf("must specify a value for log opt '%s'", logGroupKey)

 	}

-	if cfg[regionKey] == "" && os.Getenv(regionEnvKey) == "" {

-		return fmt.Errorf(

-			"must specify a value for environment variable '%s' or log opt '%s'",

-			regionEnvKey,

-			regionKey)

-	}

 	return nil

 }

@@ -2,14 +2,19 @@ package awslogs

 import (

 	"errors"

+	"fmt"

+	"net/http"

+	"runtime"

 	"strings"

 	"testing"

 	"time"

 	"github.com/aws/aws-sdk-go/aws"

 	"github.com/aws/aws-sdk-go/aws/awserr"

+	"github.com/aws/aws-sdk-go/aws/request"

 	"github.com/aws/aws-sdk-go/service/cloudwatchlogs"

 	"github.com/docker/docker/daemon/logger"

+	"github.com/docker/docker/version"

 )

 const (

@@ -20,6 +25,56 @@ const (

 	logline           = "this is a log line"

 )

+func TestNewAWSLogsClientUserAgentHandler(t *testing.T) {

+	ctx := logger.Context{

+		Config: map[string]string{

+			regionKey: "us-east-1",

+		},

+	}

+

+	client, err := newAWSLogsClient(ctx)

+	if err != nil {

+		t.Fatal(err)

+	}

+	realClient, ok := client.(*cloudwatchlogs.CloudWatchLogs)

+	if !ok {

+		t.Fatal("Could not cast client to cloudwatchlogs.CloudWatchLogs")

+	}

+	buildHandlerList := realClient.Handlers.Build

+	request := &request.Request{

+		HTTPRequest: &http.Request{

+			Header: http.Header{},

+		},

+	}

+	buildHandlerList.Run(request)

+	expectedUserAgentString := fmt.Sprintf("Docker %s (%s) %s/%s",

+		version.VERSION, runtime.GOOS, aws.SDKName, aws.SDKVersion)

+	userAgent := request.HTTPRequest.Header.Get("User-Agent")

+	if userAgent != expectedUserAgentString {

+		t.Errorf("Wrong User-Agent string, expected \"%s\" but was \"%s\"",

+			expectedUserAgentString, userAgent)

+	}

+}

+

+func TestNewAWSLogsClientRegionDetect(t *testing.T) {

+	ctx := logger.Context{

+		Config: map[string]string{},

+	}

+

+	mockMetadata := newMockMetadataClient()

+	newRegionFinder = func() regionFinder {

+		return mockMetadata

+	}

+	mockMetadata.regionResult <- &regionResult{

+		successResult: "us-east-1",

+	}

+

+	_, err := newAWSLogsClient(ctx)

+	if err != nil {

+		t.Fatal(err)

+	}

+}

+

 func TestCreateSuccess(t *testing.T) {

 	mockClient := newMockClient()

 	stream := &logStream{

@@ -49,6 +49,26 @@ func (m *mockcwlogsclient) PutLogEvents(input *cloudwatchlogs.PutLogEventsInput)

 	return output.successResult, output.errorResult

 }

+type mockmetadataclient struct {

+	regionResult chan *regionResult

+}

+

+type regionResult struct {

+	successResult string

+	errorResult   error

+}

+

+func newMockMetadataClient() *mockmetadataclient {

+	return &mockmetadataclient{

+		regionResult: make(chan *regionResult, 1),

+	}

+}

+

+func (m *mockmetadataclient) Region() (string, error) {

+	output := <-m.regionResult

+	return output.successResult, output.errorResult

+}

+

 func test() {

 	_ = &logStream{

 		client: newMockClient(),

@@ -34,9 +34,10 @@ You can use the `--log-opt NAME=VALUE` flag to specify Amazon CloudWatch Logs lo

 ### awslogs-region

-You must specify a region for the `awslogs` logging driver. You can specify the

-region with either the `awslogs-region` log option or `AWS_REGION` environment

-variable:

+The `awslogs` logging driver sends your Docker logs to a specific region. Use

+the `awslogs-region` log option or the `AWS_REGION` environment variable to set

+the region.  By default, if your Docker daemon is running on an EC2 instance

+and no region is set, the driver uses the instance's region.

     docker run --log-driver=awslogs --log-opt awslogs-region=us-east-1 ...

@@ -64,7 +64,7 @@ clone git github.com/tinylib/msgp 75ee40d2601edf122ef667e2a07d600d4c44490c

 clone git gopkg.in/fsnotify.v1 v1.2.0

 # awslogs deps

-clone git github.com/aws/aws-sdk-go v0.7.1

+clone git github.com/aws/aws-sdk-go v0.9.9

 clone git github.com/vaughan0/go-ini a98ad7ee00ec53921f08832bc06ecf7fd600e6a1

 clean

@@ -113,7 +113,7 @@ func newRequestError(err Error, statusCode int, requestID string) *requestError

 // Error returns the string representation of the error.

 // Satisfies the error interface.

 func (r requestError) Error() string {

-	extra := fmt.Sprintf("status code: %d, request id: [%s]",

+	extra := fmt.Sprintf("status code: %d, request id: %s",

 		r.statusCode, r.requestID)

 	return SprintError(r.Code(), r.Message(), extra, r.OrigErr())

 }

@@ -2,48 +2,20 @@ package aws

 import (

 	"net/http"

-	"os"

 	"time"

 	"github.com/aws/aws-sdk-go/aws/credentials"

 )

-// DefaultChainCredentials is a Credentials which will find the first available

-// credentials Value from the list of Providers.

-//

-// This should be used in the default case. Once the type of credentials are

-// known switching to the specific Credentials will be more efficient.

-var DefaultChainCredentials = credentials.NewChainCredentials(

-	[]credentials.Provider{

-		&credentials.EnvProvider{},

-		&credentials.SharedCredentialsProvider{Filename: "", Profile: ""},

-		&credentials.EC2RoleProvider{ExpiryWindow: 5 * time.Minute},

-	})

-

 // The default number of retries for a service. The value of -1 indicates that

 // the service specific retry default will be used.

 const DefaultRetries = -1

-// DefaultConfig is the default all service configuration will be based off of.

-// By default, all clients use this structure for initialization options unless

-// a custom configuration object is passed in.

-//

-// You may modify this global structure to change all default configuration

-// in the SDK. Note that configuration options are copied by value, so any

-// modifications must happen before constructing a client.

-var DefaultConfig = NewConfig().

-	WithCredentials(DefaultChainCredentials).

-	WithRegion(os.Getenv("AWS_REGION")).

-	WithHTTPClient(http.DefaultClient).

-	WithMaxRetries(DefaultRetries).

-	WithLogger(NewDefaultLogger()).

-	WithLogLevel(LogOff)

-

 // A Config provides service configuration for service clients. By default,

-// all clients will use the {DefaultConfig} structure.

+// all clients will use the {defaults.DefaultConfig} structure.

 type Config struct {

 	// The credentials object to use when signing requests. Defaults to

-	// {DefaultChainCredentials}.

+	// {defaults.DefaultChainCredentials}.

 	Credentials *credentials.Credentials

 	// An optional endpoint URL (hostname only or fully qualified URI)

@@ -102,6 +74,8 @@ type Config struct {

 	// @see http://docs.aws.amazon.com/AmazonS3/latest/dev/VirtualHosting.html

 	//   Amazon S3: Virtual Hosting of Buckets

 	S3ForcePathStyle *bool

+

+	SleepDelay func(time.Duration)

 }

 // NewConfig returns a new Config pointer that can be chained with builder methods to

@@ -190,6 +164,13 @@ func (c *Config) WithS3ForcePathStyle(force bool) *Config {

 	return c

 }

+// WithSleepDelay overrides the function used to sleep while waiting for the

+// next retry. Defaults to time.Sleep.

+func (c *Config) WithSleepDelay(fn func(time.Duration)) *Config {

+	c.SleepDelay = fn

+	return c

+}

+

 // Merge returns a new Config with the other Config's attribute values merged into

 // this Config. If the other Config's attribute is nil it will not be merged into

 // the new Config to be returned.

@@ -244,6 +225,10 @@ func (c Config) Merge(other *Config) *Config {

 		dst.S3ForcePathStyle = other.S3ForcePathStyle

 	}

+	if other.SleepDelay != nil {

+		dst.SleepDelay = other.SleepDelay

+	}

+

 	return &dst

 }

new file mode 100644

@@ -0,0 +1,357 @@

+package aws

+

+import "time"

+

+// String returns a pointer to of the string value passed in.

+func String(v string) *string {

+	return &v

+}

+

+// StringValue returns the value of the string pointer passed in or

+// "" if the pointer is nil.

+func StringValue(v *string) string {

+	if v != nil {

+		return *v

+	}

+	return ""

+}

+

+// StringSlice converts a slice of string values into a slice of

+// string pointers

+func StringSlice(src []string) []*string {

+	dst := make([]*string, len(src))

+	for i := 0; i < len(src); i++ {

+		dst[i] = &(src[i])

+	}

+	return dst

+}

+

+// StringValueSlice converts a slice of string pointers into a slice of

+// string values

+func StringValueSlice(src []*string) []string {

+	dst := make([]string, len(src))

+	for i := 0; i < len(src); i++ {

+		if src[i] != nil {

+			dst[i] = *(src[i])

+		}

+	}

+	return dst

+}

+

+// StringMap converts a string map of string values into a string

+// map of string pointers

+func StringMap(src map[string]string) map[string]*string {

+	dst := make(map[string]*string)

+	for k, val := range src {

+		v := val

+		dst[k] = &v

+	}

+	return dst

+}

+

+// StringValueMap converts a string map of string pointers into a string

+// map of string values

+func StringValueMap(src map[string]*string) map[string]string {

+	dst := make(map[string]string)

+	for k, val := range src {

+		if val != nil {

+			dst[k] = *val

+		}

+	}

+	return dst

+}

+

+// Bool returns a pointer to of the bool value passed in.

+func Bool(v bool) *bool {

+	return &v

+}

+

+// BoolValue returns the value of the bool pointer passed in or

+// false if the pointer is nil.

+func BoolValue(v *bool) bool {

+	if v != nil {

+		return *v

+	}

+	return false

+}

+

+// BoolSlice converts a slice of bool values into a slice of

+// bool pointers

+func BoolSlice(src []bool) []*bool {

+	dst := make([]*bool, len(src))

+	for i := 0; i < len(src); i++ {

+		dst[i] = &(src[i])

+	}

+	return dst

+}

+

+// BoolValueSlice converts a slice of bool pointers into a slice of

+// bool values

+func BoolValueSlice(src []*bool) []bool {

+	dst := make([]bool, len(src))

+	for i := 0; i < len(src); i++ {

+		if src[i] != nil {

+			dst[i] = *(src[i])

+		}

+	}

+	return dst

+}

+

+// BoolMap converts a string map of bool values into a string

+// map of bool pointers

+func BoolMap(src map[string]bool) map[string]*bool {

+	dst := make(map[string]*bool)

+	for k, val := range src {

+		v := val

+		dst[k] = &v

+	}

+	return dst

+}

+

+// BoolValueMap converts a string map of bool pointers into a string

+// map of bool values

+func BoolValueMap(src map[string]*bool) map[string]bool {

+	dst := make(map[string]bool)

+	for k, val := range src {

+		if val != nil {

+			dst[k] = *val

+		}

+	}

+	return dst

+}

+

+// Int returns a pointer to of the int value passed in.

+func Int(v int) *int {

+	return &v

+}

+

+// IntValue returns the value of the int pointer passed in or

+// 0 if the pointer is nil.

+func IntValue(v *int) int {

+	if v != nil {

+		return *v

+	}

+	return 0

+}

+

+// IntSlice converts a slice of int values into a slice of

+// int pointers

+func IntSlice(src []int) []*int {

+	dst := make([]*int, len(src))

+	for i := 0; i < len(src); i++ {

+		dst[i] = &(src[i])

+	}

+	return dst

+}

+

+// IntValueSlice converts a slice of int pointers into a slice of

+// int values

+func IntValueSlice(src []*int) []int {

+	dst := make([]int, len(src))

+	for i := 0; i < len(src); i++ {

+		if src[i] != nil {

+			dst[i] = *(src[i])

+		}

+	}

+	return dst

+}

+

+// IntMap converts a string map of int values into a string

+// map of int pointers

+func IntMap(src map[string]int) map[string]*int {

+	dst := make(map[string]*int)

+	for k, val := range src {

+		v := val

+		dst[k] = &v

+	}

+	return dst

+}

+

+// IntValueMap converts a string map of int pointers into a string

+// map of int values

+func IntValueMap(src map[string]*int) map[string]int {

+	dst := make(map[string]int)

+	for k, val := range src {

+		if val != nil {

+			dst[k] = *val

+		}

+	}

+	return dst

+}

+

+// Int64 returns a pointer to of the int64 value passed in.

+func Int64(v int64) *int64 {

+	return &v

+}

+

+// Int64Value returns the value of the int64 pointer passed in or

+// 0 if the pointer is nil.

+func Int64Value(v *int64) int64 {

+	if v != nil {

+		return *v

+	}

+	return 0

+}

+

+// Int64Slice converts a slice of int64 values into a slice of

+// int64 pointers

+func Int64Slice(src []int64) []*int64 {

+	dst := make([]*int64, len(src))

+	for i := 0; i < len(src); i++ {

+		dst[i] = &(src[i])

+	}

+	return dst

+}

+

+// Int64ValueSlice converts a slice of int64 pointers into a slice of

+// int64 values

+func Int64ValueSlice(src []*int64) []int64 {

+	dst := make([]int64, len(src))

+	for i := 0; i < len(src); i++ {

+		if src[i] != nil {

+			dst[i] = *(src[i])

+		}

+	}

+	return dst

+}

+

+// Int64Map converts a string map of int64 values into a string

+// map of int64 pointers

+func Int64Map(src map[string]int64) map[string]*int64 {

+	dst := make(map[string]*int64)

+	for k, val := range src {

+		v := val

+		dst[k] = &v

+	}

+	return dst

+}

+

+// Int64ValueMap converts a string map of int64 pointers into a string

+// map of int64 values

+func Int64ValueMap(src map[string]*int64) map[string]int64 {

+	dst := make(map[string]int64)

+	for k, val := range src {

+		if val != nil {

+			dst[k] = *val

+		}

+	}

+	return dst

+}

+

+// Float64 returns a pointer to of the float64 value passed in.

+func Float64(v float64) *float64 {

+	return &v

+}

+

+// Float64Value returns the value of the float64 pointer passed in or

+// 0 if the pointer is nil.

+func Float64Value(v *float64) float64 {

+	if v != nil {

+		return *v

+	}

+	return 0

+}

+

+// Float64Slice converts a slice of float64 values into a slice of

+// float64 pointers

+func Float64Slice(src []float64) []*float64 {

+	dst := make([]*float64, len(src))

+	for i := 0; i < len(src); i++ {

+		dst[i] = &(src[i])

+	}

+	return dst

+}

+

+// Float64ValueSlice converts a slice of float64 pointers into a slice of

+// float64 values

+func Float64ValueSlice(src []*float64) []float64 {

+	dst := make([]float64, len(src))

+	for i := 0; i < len(src); i++ {

+		if src[i] != nil {

+			dst[i] = *(src[i])

+		}

+	}

+	return dst

+}

+

+// Float64Map converts a string map of float64 values into a string

+// map of float64 pointers

+func Float64Map(src map[string]float64) map[string]*float64 {

+	dst := make(map[string]*float64)

+	for k, val := range src {

+		v := val

+		dst[k] = &v

+	}

+	return dst

+}

+

+// Float64ValueMap converts a string map of float64 pointers into a string

+// map of float64 values

+func Float64ValueMap(src map[string]*float64) map[string]float64 {

+	dst := make(map[string]float64)

+	for k, val := range src {

+		if val != nil {

+			dst[k] = *val

+		}

+	}

+	return dst

+}

+

+// Time returns a pointer to of the time.Time value passed in.

+func Time(v time.Time) *time.Time {

+	return &v

+}

+

+// TimeValue returns the value of the time.Time pointer passed in or

+// time.Time{} if the pointer is nil.

+func TimeValue(v *time.Time) time.Time {

+	if v != nil {

+		return *v

+	}

+	return time.Time{}

+}

+

+// TimeSlice converts a slice of time.Time values into a slice of

+// time.Time pointers

+func TimeSlice(src []time.Time) []*time.Time {

+	dst := make([]*time.Time, len(src))

+	for i := 0; i < len(src); i++ {

+		dst[i] = &(src[i])

+	}

+	return dst

+}

+

+// TimeValueSlice converts a slice of time.Time pointers into a slice of

+// time.Time values

+func TimeValueSlice(src []*time.Time) []time.Time {

+	dst := make([]time.Time, len(src))

+	for i := 0; i < len(src); i++ {

+		if src[i] != nil {

+			dst[i] = *(src[i])

+		}

+	}

+	return dst

+}

+

+// TimeMap converts a string map of time.Time values into a string

+// map of time.Time pointers

+func TimeMap(src map[string]time.Time) map[string]*time.Time {

+	dst := make(map[string]*time.Time)

+	for k, val := range src {

+		v := val

+		dst[k] = &v

+	}

+	return dst

+}

+

+// TimeValueMap converts a string map of time.Time pointers into a string

+// map of time.Time values

+func TimeValueMap(src map[string]*time.Time) map[string]time.Time {

+	dst := make(map[string]time.Time)

+	for k, val := range src {

+		if val != nil {

+			dst[k] = *val

+		}

+	}

+	return dst

+}

deleted file mode 100644

@@ -1,357 +0,0 @@

-package aws

-

-import "time"

-

-// String returns a pointer to of the string value passed in.

-func String(v string) *string {

-	return &v

-}

-

-// StringValue returns the value of the string pointer passed in or

-// "" if the pointer is nil.

-func StringValue(v *string) string {

-	if v != nil {

-		return *v

-	}

-	return ""

-}

-

-// StringSlice converts a slice of string values into a slice of

-// string pointers

-func StringSlice(src []string) []*string {

-	dst := make([]*string, len(src))

-	for i := 0; i < len(src); i++ {

-		dst[i] = &(src[i])

-	}

-	return dst

-}

-

-// StringValueSlice converts a slice of string pointers into a slice of

-// string values

-func StringValueSlice(src []*string) []string {

-	dst := make([]string, len(src))

-	for i := 0; i < len(src); i++ {

-		if src[i] != nil {

-			dst[i] = *(src[i])

-		}

-	}

-	return dst

-}

-

-// StringMap converts a string map of string values into a string

-// map of string pointers

-func StringMap(src map[string]string) map[string]*string {

-	dst := make(map[string]*string)

-	for k, val := range src {

-		v := val

-		dst[k] = &v

-	}

-	return dst

-}

-

-// StringValueMap converts a string map of string pointers into a string

-// map of string values

-func StringValueMap(src map[string]*string) map[string]string {

-	dst := make(map[string]string)

-	for k, val := range src {

-		if val != nil {

-			dst[k] = *val

-		}

-	}

-	return dst

-}

-

-// Bool returns a pointer to of the bool value passed in.

-func Bool(v bool) *bool {

-	return &v

-}

-

-// BoolValue returns the value of the bool pointer passed in or

-// false if the pointer is nil.

-func BoolValue(v *bool) bool {

-	if v != nil {

-		return *v

-	}

-	return false

-}

-

-// BoolSlice converts a slice of bool values into a slice of

-// bool pointers

-func BoolSlice(src []bool) []*bool {

-	dst := make([]*bool, len(src))

-	for i := 0; i < len(src); i++ {

-		dst[i] = &(src[i])

-	}

-	return dst

-}

-

-// BoolValueSlice converts a slice of bool pointers into a slice of

-// bool values

-func BoolValueSlice(src []*bool) []bool {

-	dst := make([]bool, len(src))

-	for i := 0; i < len(src); i++ {

-		if src[i] != nil {

-			dst[i] = *(src[i])

-		}

-	}

-	return dst

-}

-

-// BoolMap converts a string map of bool values into a string

-// map of bool pointers

-func BoolMap(src map[string]bool) map[string]*bool {

-	dst := make(map[string]*bool)

-	for k, val := range src {

-		v := val

-		dst[k] = &v

-	}

-	return dst

-}

-

-// BoolValueMap converts a string map of bool pointers into a string

-// map of bool values

-func BoolValueMap(src map[string]*bool) map[string]bool {

-	dst := make(map[string]bool)

-	for k, val := range src {

-		if val != nil {

-			dst[k] = *val

-		}

-	}

-	return dst

-}

-

-// Int returns a pointer to of the int value passed in.

-func Int(v int) *int {

-	return &v

-}

-

-// IntValue returns the value of the int pointer passed in or

-// 0 if the pointer is nil.

-func IntValue(v *int) int {

-	if v != nil {

-		return *v

-	}

-	return 0

-}

-

-// IntSlice converts a slice of int values into a slice of

-// int pointers