Merge pull request #7 from awsdocs/master

update from master

Author: brmur

gov2/.gitignore

@@ -0,0 +1 @@
+*.exe

gov2/cloudwatch/CreateCustomMetric/CreateCustomMetricv2.go

@@ -0,0 +1,84 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX - License - Identifier: Apache - 2.0
+// snippet-start:[cloudwatch.go-v2.CreateCustomMetric]
+package main
+
+import (
+	"context"
+	"flag"
+	"fmt"
+
+	"github.com/aws/aws-sdk-go-v2/config"
+	"github.com/aws/aws-sdk-go-v2/service/cloudwatch"
+	"github.com/aws/aws-sdk-go-v2/service/cloudwatch/types"
+)
+
+// CWPutMetricDataAPI defines the interface for the PutMetricData function.
+// We use this interface to test the function using a mocked service.
+type CWPutMetricDataAPI interface {
+	PutMetricData(ctx context.Context,
+		params *cloudwatch.PutMetricDataInput,
+		optFns ...func(*cloudwatch.Options)) (*cloudwatch.PutMetricDataOutput, error)
+}
+
+// CreateCustomMetric creates a new Amazon CloudWatch metric in a namespace
+// Inputs:
+//     c is the context of the method call, which includes the Region
+//     api is the interface that defines the method call
+//     input defines the input arguments to the service call.
+// Output:
+//     If success, a METHODOutput object containing the result of the service call and nil
+//     Otherwise, nil and an error from the call to PutMetricData
+func CreateCustomMetric(c context.Context, api CWPutMetricDataAPI, input *cloudwatch.PutMetricDataInput) (*cloudwatch.PutMetricDataOutput, error) {
+	resp, err := api.PutMetricData(c, input)
+
+	return resp, err
+}
+
+func main() {
+	namespace := flag.String("n", "", "The namespace for the metric")
+	metricName := flag.String("m", "", "The name of the metric")
+	value := flag.Float64("s", 0.0, "The number of seconds for the units")
+	dimensionName := flag.String("dn", "", "The name of the dimension")
+	dimensionValue := flag.String("dv", "", "The value of the dimension")
+	flag.Parse()
+
+	if *namespace == "" || *metricName == "" || *dimensionName == "" || *dimensionValue == "" {
+		fmt.Println("You must supply a namespace, metric name, dimension name, and dimension value")
+		return
+	}
+
+	cfg, err := config.LoadDefaultConfig()
+	if err != nil {
+		panic("configuration error, " + err.Error())
+	}
+
+	client := cloudwatch.NewFromConfig(cfg)
+
+	input := &cloudwatch.PutMetricDataInput{
+		Namespace: namespace,
+		MetricData: []*types.MetricDatum{
+			&types.MetricDatum{
+				MetricName: metricName,
+				Unit:       types.StandardUnitSeconds,
+				Value:      value,
+				Dimensions: []*types.Dimension{
+					&types.Dimension{
+						Name:  dimensionName,
+						Value: dimensionValue,
+					},
+				},
+			},
+		},
+	}
+
+	_, err = CreateCustomMetric(context.Background(), client, input)
+	if err != nil {
+		fmt.Println()
+		return
+	}
+
+	fmt.Println("Created a custom metric")
+}
+
+// snippet-end:[cloudwatch.go-v2.CreateCustomMetric]

gov2/cloudwatch/CreateCustomMetric/CreateCustomMetricv2_test.go

@@ -0,0 +1,109 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX - License - Identifier: Apache - 2.0
+
+package main
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"io/ioutil"
+	"strconv"
+	"testing"
+	"time"
+
+	"github.com/aws/aws-sdk-go-v2/service/cloudwatch"
+	"github.com/aws/aws-sdk-go-v2/service/cloudwatch/types"
+)
+
+type CWPutMetricDataImpl struct{}
+
+func (dt CWPutMetricDataImpl) PutMetricData(ctx context.Context,
+	params *cloudwatch.PutMetricDataInput,
+	optFns ...func(*cloudwatch.Options)) (*cloudwatch.PutMetricDataOutput, error) {
+
+	output := &cloudwatch.PutMetricDataOutput{}
+
+	return output, nil
+}
+
+type Config struct {
+	Namespace      string `json:"Namespace"`
+	MetricName     string `json:"MetricName"`
+	MetricValueS   string `json:"MetricValue"`
+	MetricValue    float64
+	DimensionName  string `json:"DimensionName"`
+	DimensionValue string `json:"DimensionValue"`
+}
+
+var configFileName = "config.json"
+
+var globalConfig Config
+
+func populateConfiguration(t *testing.T) error {
+	content, err := ioutil.ReadFile(configFileName)
+	if err != nil {
+		return err
+	}
+
+	text := string(content)
+
+	err = json.Unmarshal([]byte(text), &globalConfig)
+	if err != nil {
+		return err
+	}
+
+	if globalConfig.Namespace == "" || globalConfig.MetricName == "" || globalConfig.MetricValueS == "" || globalConfig.DimensionName == "" || globalConfig.DimensionValue == "" {
+		msg := "You must specify a value for Namespace, MetricName, MetricValue, DimensionName, and DimensionValue in " + configFileName
+		return errors.New(msg)
+	}
+
+	// Make sure metric value is a float64
+	f, err := strconv.ParseFloat(globalConfig.MetricValueS, 64)
+	if err != nil {
+		return err
+	}
+
+	globalConfig.MetricValue = f
+
+	return nil
+}
+
+func TestCreateCustomMetric(t *testing.T) {
+	thisTime := time.Now()
+	nowString := thisTime.Format("2006-01-02 15:04:05 Monday")
+	t.Log("Starting unit test at " + nowString)
+
+	err := populateConfiguration(t)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	input := &cloudwatch.PutMetricDataInput{
+		Namespace: &globalConfig.Namespace,
+		MetricData: []*types.MetricDatum{
+			&types.MetricDatum{
+				MetricName: &globalConfig.MetricName,
+				Unit:       types.StandardUnitSeconds,
+				Value:      &globalConfig.MetricValue,
+				Dimensions: []*types.Dimension{
+					&types.Dimension{
+						Name:  &globalConfig.DimensionName,
+						Value: &globalConfig.DimensionValue,
+					},
+				},
+			},
+		},
+	}
+
+	api := &CWPutMetricDataImpl{}
+
+	_, err = CreateCustomMetric(context.Background(), *api, input)
+	if err != nil {
+		t.Log("Got an error ...:")
+		t.Log(err)
+		return
+	}
+
+	t.Log("Created a custom metric")
+}

gov2/cloudwatch/CreateCustomMetric/config.json

@@ -0,0 +1,7 @@
+{
+  "Namespace": "aws-docs-example-namespace",
+  "MetricName": "aws-docs-example-metric-name",
+  "MetricValue": "4",
+  "DimensionName": "aws-docs-example-dimension-name",
+  "DimensionValue": "aws-docs-example-dimension-value"
+}

gov2/cloudwatch/CreateEnableMetricAlarm/CreateEnableMetricAlarmv2.go

@@ -0,0 +1,119 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX - License - Identifier: Apache - 2.0
+// snippet-start:[cloudwatch.go-v2.CreateEnableMetricAlarm]
+package main
+
+import (
+	"context"
+	"flag"
+	"fmt"
+
+	"github.com/aws/aws-sdk-go-v2/aws"
+	"github.com/aws/aws-sdk-go-v2/config"
+	"github.com/aws/aws-sdk-go-v2/service/cloudwatch"
+	"github.com/aws/aws-sdk-go-v2/service/cloudwatch/types"
+)
+
+// CWEnableAlarmAPI defines the interface for the PutMetricAlarm function.
+// We use this interface to test the function using a mocked service.
+type CWEnableAlarmAPI interface {
+	PutMetricAlarm(ctx context.Context,
+		params *cloudwatch.PutMetricAlarmInput,
+		optFns ...func(*cloudwatch.Options)) (*cloudwatch.PutMetricAlarmOutput, error)
+	EnableAlarmActions(ctx context.Context,
+		params *cloudwatch.EnableAlarmActionsInput,
+		optFns ...func(*cloudwatch.Options)) (*cloudwatch.EnableAlarmActionsOutput, error)
+}
+
+// CreateMetricAlarm creates a metric alarm
+// Inputs:
+//     c is the context of the method call, which includes the Region
+//     api is the interface that defines the method call
+//     input defines the input arguments to the service call.
+// Output:
+//     If success, a METHODOutput object containing the result of the service call and nil
+//     Otherwise, the error from a call to PutMetricAlarm
+func CreateMetricAlarm(c context.Context, api CWEnableAlarmAPI, input *cloudwatch.PutMetricAlarmInput) (*cloudwatch.PutMetricAlarmOutput, error) {
+	resp, err := api.PutMetricAlarm(c, input)
+
+	return resp, err
+}
+
+// EnableAlarm enables the specified Amazon CloudWatch alarm
+// Inputs:
+//     c is the context of the method call, which includes the Region
+//     api is the interface that defines the method call
+//     input defines the input arguments to the service call.
+// Output:
+//     If success, a EnableAlarmActionsOutput object containing the result of the service call and nil
+//     Otherwise, the error from a call to PutMetricAlarm
+func EnableAlarm(c context.Context, api CWEnableAlarmAPI, input *cloudwatch.EnableAlarmActionsInput) (*cloudwatch.EnableAlarmActionsOutput, error) {
+	// Enable the alarm for the instance
+	resp, err := api.EnableAlarmActions(c, input)
+
+	return resp, err
+}
+
+func main() {
+	instanceName := flag.String("n", "", "The instance name")
+	instanceID := flag.String("i", "", "The instance ID")
+	alarmName := flag.String("a", "", "The alarm name")
+	flag.Parse()
+
+	if *instanceName == "" || *instanceID == "" || *alarmName == "" {
+		fmt.Println("You must supply an instance name, instance ID, and alarm name")
+		return
+	}
+
+	cfg, err := config.LoadDefaultConfig()
+	if err != nil {
+		panic("configuration error, " + err.Error())
+	}
+
+	client := cloudwatch.NewFromConfig(cfg)
+
+	putInput := &cloudwatch.PutMetricAlarmInput{
+		AlarmName:          alarmName,
+		ComparisonOperator: types.ComparisonOperatorGreaterthanorequaltothreshold,
+		EvaluationPeriods:  aws.Int32(1),
+		MetricName:         aws.String("CPUUtilization"),
+		Namespace:          aws.String("AWS/EC2"),
+		Period:             aws.Int32(60),
+		Statistic:          types.StatisticAverage,
+		Threshold:          aws.Float64(70.0),
+		ActionsEnabled:     aws.Bool(true),
+		AlarmDescription:   aws.String("Alarm when server CPU exceeds 70%"),
+		Unit:               types.StandardUnitSeconds,
+		AlarmActions: []*string{
+			aws.String(fmt.Sprintf("arn:aws:swf:"+cfg.Region+":%s:action/actions/AWS_EC2.InstanceId.Reboot/1.0", instanceName)),
+		},
+		Dimensions: []*types.Dimension{
+			{
+				Name:  aws.String("InstanceId"),
+				Value: instanceID,
+			},
+		},
+	}
+
+	_, err = CreateMetricAlarm(context.Background(), client, putInput)
+	if err != nil {
+		fmt.Println(err)
+		return
+	}
+
+	enableInput := &cloudwatch.EnableAlarmActionsInput{
+		AlarmNames: []*string{
+			instanceID,
+		},
+	}
+
+	_, err = EnableAlarm(context.Background(), client, enableInput)
+	if err != nil {
+		fmt.Println(err)
+		return
+	}
+
+	fmt.Println("Enabled alarm " + *alarmName + " for EC2 instance " + *instanceName)
+}
+
+// snippet-end:[cloudwatch.go-v2.CreateEnableMetricAlarm]