Makes necessary changes for updated CreateLogGroup API calls (#466)

aws · Aug 29, 2023 · fa205eb · fa205eb
1 parent 631a1db
commit fa205eb
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/plugins/outputs/cloudwatchlogs/pusher.go b/plugins/outputs/cloudwatchlogs/pusher.go
@@ -344,8 +344,8 @@ func (p *pusher) createLogGroupAndStream() error {
 	p.Log.Debugf("creating stream fail due to : %v", err)
 	if awsErr, ok := err.(awserr.Error); ok && awsErr.Code() == cloudwatchlogs.ErrCodeResourceNotFoundException {
 		_, err = p.Service.CreateLogGroup(&cloudwatchlogs.CreateLogGroupInput{
-			LogGroupName: &p.Group,
-			LogGroupTier: &p.Class,
+			LogGroupName:  &p.Group,
+			LogGroupClass: &p.Class,
 		})
 
 		// attempt to create stream again if group created successfully.

diff --git a/test/logs/logs_test.go b/test/logs/logs_test.go
@@ -38,27 +38,27 @@ type input struct {
 	testName      string
 	configPath    string
 	logGroupName  string
-	logGroupClass types.LogGroupTier
+	logGroupClass types.LogGroupClass
 }
 
 var testParameters = []input{
 	{
 		testName:      "Standard log config",
 		configPath:    "testdata/logs_config.json",
 		logGroupName:  instanceId,
-		logGroupClass: types.LogGroupTierStandard,
+		logGroupClass: types.LogGroupClassStandard,
 	},
 	{
 		testName:      "Standard log config with standard class specification",
 		configPath:    "testdata/logs_config_standard.json",
 		logGroupName:  instanceId,
-		logGroupClass: types.LogGroupTierStandard,
+		logGroupClass: types.LogGroupClassStandard,
 	},
-	{ //TODO update all naming from basic to essentials once SDK changes are available
-		testName:      "Standard log config with basic class specification",
+	{
+		testName:      "Standard log config with essentials class specification",
 		configPath:    "testdata/logs_config_basic.json",
-		logGroupName:  instanceId + "-basic",
-		logGroupClass: types.LogGroupTierBasic,
+		logGroupName:  instanceId + "-essentials",
+		logGroupClass: types.LogGroupClassEssentials,
 	},
 }
 
@@ -108,7 +108,7 @@ func validateLogGroupExistence(param input) (bool, error) {
 	// check CWL to ensure we got the expected log groups
 	describeLogGroupInput := cloudwatchlogs.DescribeLogGroupsInput{
 		LogGroupNamePrefix: aws.String(param.logGroupName),
-		LogGroupTier:       param.logGroupClass,
+		LogGroupClass:      param.logGroupClass,
 	}
 
 	describeLogGroupOutput, err := CwlClient.DescribeLogGroups(ctx, &describeLogGroupInput)

diff --git a/test/logs/testdata/logs_config_basic.json b/test/logs/testdata/logs_config_basic.json
@@ -9,10 +9,10 @@
         "collect_list": [
           {
             "file_path": "/tmp/test.log",
-            "log_group_name": "{instance_id}-basic",
+            "log_group_name": "{instance_id}-essentials",
             "log_stream_name": "{instance_id}",
             "timezone": "UTC",
-            "log_group_class": "basic"
+            "log_group_class": "essentials"
           }
         ]
       }

diff --git a/tool/util/util.go b/tool/util/util.go
@@ -41,7 +41,7 @@ const (
 	MapKeyMeasurement               = "measurement"
 
 	StandardLogGroupClass   = "STANDARD"
-	EssentialsLogGroupClass = "BASIC"
+	EssentialsLogGroupClass = "ESSENTIALS"
 )
 
 func CurOS() string {

diff --git a/translator/translate/logs/logs_collected/files/collect_list/collect_list_test.go b/translator/translate/logs/logs_collected/files/collect_list/collect_list_test.go
@@ -865,7 +865,7 @@ func TestConflictingLogGroupClass(t *testing.T) {
 				"file_path":"path1",
        			"log_group_name":"test1",
 				"retention_in_days":3,
-				"log_group_class":   "basic"
+				"log_group_class":   "essentials"
 
 			}
 		]

diff --git a/translator/translate/logs/logs_collected/files/collect_list/ruleLogGroupClass_test.go b/translator/translate/logs/logs_collected/files/collect_list/ruleLogGroupClass_test.go
@@ -16,7 +16,7 @@ func TestApplyLogGroupClassRule(t *testing.T) {
 	r := new(LogGroupClass)
 	var input interface{}
 	e := json.Unmarshal([]byte(`{
-			"log_group_class": "basic"
+			"log_group_class": "essentials"
 	}`), &input)
 	if e == nil {
 		actualReturnKey, actualReturnVal := r.ApplyRule(input)