Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add tests for remaining aws integrations #48

Closed
wants to merge 9 commits into from
Closed

Add tests for remaining aws integrations #48

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5d66d3e
Add tests for two remaining aws integrations
nmuesch Dec 17, 2019
9637972
Remove log lines
nmuesch Dec 17, 2019
0cdbcde
Add missing logs integration tests
nmuesch Dec 18, 2019
ca15534
Address review and use new schema
nmuesch Dec 18, 2019
e97bc88
Merge branch 'master' into datadog-api-spec/pr/162
nmuesch Dec 18, 2019
1d6d764
Merge branch 'master' into datadog-api-spec/pr/162
nmuesch Dec 19, 2019
40b6314
Fix up after merge conflicts
nmuesch Dec 19, 2019
a13bf8d
Address review + cleanup merge conflict
nmuesch Dec 20, 2019
49c32e7
Address review
nmuesch Dec 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions api/v1/datadog/api_aws_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,40 @@ func TestDisableAWSAcct(t *testing.T) {
assert.Equal(t, httpresp.StatusCode, 200, "Error disabling AWS Account: %v", httpresp)
}

func TestGenerateNewExternalId(t *testing.T) {
testAwsAccount := generateUniqueAwsAccount()
// Lets first create the account for us to generate a new id against
_, httpresp, err := TESTAPICLIENT.AWSIntegrationApi.CreateAWSAccount(TESTAUTH).AwsAccount(testAwsAccount).Execute()
if err != nil || httpresp.StatusCode != 200 {
t.Fatalf("Error creating AWS Account: Response %s: %v", err.(datadog.GenericOpenAPIError).Body(), err)
}
apiResp, httpresp, err := TESTAPICLIENT.AWSIntegrationApi.GenerateNewAWSExternalID(TESTAUTH).AwsAccount(testAwsAccount).Execute()
if err != nil {
t.Fatalf("Error generating new AWS External ID %v", err)
}
assert.Equal(t, httpresp.StatusCode, 200)
gzussa marked this conversation as resolved.
Show resolved Hide resolved
assert.Assert(t, apiResp.GetExternalId() != "")
}

func TestListNamespaces(t *testing.T) {
namespaces, httpresp, err := TESTAPICLIENT.AWSIntegrationApi.ListAvailableAWSNamespaces(TESTAUTH).Execute()
if err != nil {
t.Fatalf("Error listing AWS Namespaces %v", err)
gzussa marked this conversation as resolved.
Show resolved Hide resolved
}
assert.Equal(t, httpresp.StatusCode, 200)
namespacesCheck := make(map[string]bool)
for _, namespace := range namespaces {
namespacesCheck[namespace] = true
}

// Check that a few examples are in the response
// Full list - https://docs.datadoghq.com/api/?lang=bash#list-namespace-rules
assert.Assert(t, namespacesCheck["api_gateway"], true)
assert.Assert(t, namespacesCheck["cloudsearch"], true)
assert.Assert(t, namespacesCheck["directconnect"], true)
assert.Assert(t, namespacesCheck["xray"], true)
}

func uninstallAWSIntegration(account datadog.AwsAccount) {
_, httpresp, err := TESTAPICLIENT.AWSIntegrationApi.DeleteAWSAccount(TESTAUTH).AwsAccount(account).Execute()
if httpresp.StatusCode != 200 || err != nil {
Expand Down
116 changes: 86 additions & 30 deletions api/v1/datadog/api_aws_logs_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"gotest.tools/assert"
)

func generateUniqueAwsLambdaAccounts() (datadog.AwsAccount, datadog.AwsAccountAndLambdaInput, datadog.AwsLogsServicesInput) {
func generateUniqueAwsLambdaAccounts() (datadog.AwsAccount, datadog.AwsAccountAndLambdaRequest, datadog.AwsLogsServicesRequest) {
accountID := fmt.Sprintf("go_%09d", time.Now().UnixNano()%1000000000)
var uniqueAwsAccount = datadog.AwsAccount{
AccountId: &accountID,
Expand All @@ -19,12 +19,12 @@ func generateUniqueAwsLambdaAccounts() (datadog.AwsAccount, datadog.AwsAccountAn
HostTags: &[]string{"filter:one", "filtertwo"},
}

var testLambdaArn = datadog.AwsAccountAndLambdaInput{
var testLambdaArn = datadog.AwsAccountAndLambdaRequest{
AccountId: *uniqueAwsAccount.AccountId,
LambdaArn: "arn:aws:lambda:us-east-1:123456789101:function:GoClientTest",
}

var savedServices = datadog.AwsLogsServicesInput{
var savedServices = datadog.AwsLogsServicesRequest{
AccountId: *uniqueAwsAccount.AccountId,
Services: []string{"s3", "elb", "elbv2", "cloudfront", "redshift", "lambda"},
}
Expand All @@ -41,34 +41,34 @@ func TestAddAndSaveAWSLogs(t *testing.T) {
defer uninstallAWSIntegration(testawsacc)

// Assert AWS Integration Created with proper fields
_, httpResp, err := TESTAPICLIENT.AWSIntegrationApi.CreateAWSAccount(TESTAUTH).AwsAccount(testawsacc).Execute()
_, httpresp, err := TESTAPICLIENT.AWSIntegrationApi.CreateAWSAccount(TESTAUTH).AwsAccount(testawsacc).Execute()
if err != nil {
t.Fatalf("Error creating AWS Account: Response %s: %v", err.(datadog.GenericOpenAPIError).Body(), err)
}
assert.Equal(t, httpResp.StatusCode, 200)
assert.Equal(t, httpresp.StatusCode, 200)

_, httpResp, err = TESTAPICLIENT.AWSLogsIntegrationApi.AddAWSLambdaARN(TESTAUTH).AwsAccountAndLambdaInput(testLambdaAcc).Execute()
_, httpresp, err = TESTAPICLIENT.AWSLogsIntegrationApi.AddAWSLambdaARN(TESTAUTH).AwsAccountAndLambdaRequest(testLambdaAcc).Execute()
if err != nil {
t.Errorf("Error adding lamda ARN: Response %s: %v", err.(datadog.GenericOpenAPIError).Body(), err)
}
assert.Equal(t, httpResp.StatusCode, 200)
assert.Equal(t, httpresp.StatusCode, 200)

_, httpResp, err = TESTAPICLIENT.AWSLogsIntegrationApi.EnableAWSLogServices(TESTAUTH).AwsLogsServicesInput(testServices).Execute()
_, httpresp, err = TESTAPICLIENT.AWSLogsIntegrationApi.EnableAWSLogServices(TESTAUTH).AwsLogsServicesRequest(testServices).Execute()
if err != nil {
t.Errorf("Error enabling log services: Response %s: %v", err.(datadog.GenericOpenAPIError).Body(), err)
}
assert.Equal(t, httpResp.StatusCode, 200)
assert.Equal(t, httpresp.StatusCode, 200)
}

func TestListAWSLogsServices(t *testing.T) {
// Setup the Client we'll use to interact with the Test account
teardownTest := setupTest(t)
defer teardownTest(t)
listServicesOutput, httpResp, err := TESTAPICLIENT.AWSLogsIntegrationApi.AWSLogsServicesList(TESTAUTH).Execute()
listServicesOutput, httpresp, err := TESTAPICLIENT.AWSLogsIntegrationApi.AWSLogsServicesList(TESTAUTH).Execute()
if err != nil {
t.Errorf("Error listing log services: Response %s: %v", err.(datadog.GenericOpenAPIError).Body(), err)
}
assert.Equal(t, httpResp.StatusCode, 200)
assert.Equal(t, httpresp.StatusCode, 200)

// There are currently 6 supported AWS Logs services as noted in the docs
// https://docs.datadoghq.com/api/?lang=bash#get-list-of-aws-log-ready-services
Expand All @@ -83,70 +83,126 @@ func TestListAndDeleteAWSLogs(t *testing.T) {
defer uninstallAWSIntegration(testAWSAcc)

// Create the AWS integration.
_, httpResp, err := TESTAPICLIENT.AWSIntegrationApi.CreateAWSAccount(TESTAUTH).AwsAccount(testAWSAcc).Execute()
_, httpresp, err := TESTAPICLIENT.AWSIntegrationApi.CreateAWSAccount(TESTAUTH).AwsAccount(testAWSAcc).Execute()
if err != nil {
t.Fatalf("Error creating AWS Account: Response %s: %v", err.(datadog.GenericOpenAPIError).Body(), err)
}
assert.Equal(t, httpResp.StatusCode, 200)
assert.Equal(t, httpresp.StatusCode, 200)

// Add Lambda to Account
addOutput, httpresp, err := TESTAPICLIENT.AWSLogsIntegrationApi.AddAWSLambdaARN(TESTAUTH).AwsAccountAndLambdaInput(testLambdaAcc).Execute()
addOutput, httpresp, err := TESTAPICLIENT.AWSLogsIntegrationApi.AddAWSLambdaARN(TESTAUTH).AwsAccountAndLambdaRequest(testLambdaAcc).Execute()
if err != nil || httpresp.StatusCode != 200 {
t.Errorf("Error Adding Lambda %v: Response %s: %v", addOutput, err.(datadog.GenericOpenAPIError).Body(), err)
}
assert.Equal(t, httpResp.StatusCode, 200)
assert.Equal(t, httpresp.StatusCode, 200)

// Enable services for Lambda
_, httpResp, err = TESTAPICLIENT.AWSLogsIntegrationApi.EnableAWSLogServices(TESTAUTH).AwsLogsServicesInput(testServices).Execute()
_, httpresp, err = TESTAPICLIENT.AWSLogsIntegrationApi.EnableAWSLogServices(TESTAUTH).AwsLogsServicesRequest(testServices).Execute()
if err != nil {
t.Fatalf("Error enabling log services: Response %s: %v", err.(datadog.GenericOpenAPIError).Body(), err)
}
assert.Equal(t, httpResp.StatusCode, 200)
assert.Equal(t, httpresp.StatusCode, 200)

// List AWS Logs integrations before deleting
listOutput1, _, err := TESTAPICLIENT.AWSLogsIntegrationApi.AWSLogsList(TESTAUTH).Execute()
if err != nil {
t.Errorf("Error listing log services: Response %s: %v", err.(datadog.GenericOpenAPIError).Body(), err)
}
assert.Equal(t, httpResp.StatusCode, 200)
assert.Equal(t, httpresp.StatusCode, 200)
// Iterate over output and list Lambdas
var x = false
var accountExists = false
for _, Account := range listOutput1 {
if Account.GetAccountId() == *testAWSAcc.AccountId {
if Account.GetLambdas()[0].GetArn() == testLambdaAcc.LambdaArn {
x = true
accountExists = true
}
}
}
// Test that variable is true as expected
assert.Equal(t, x, true)
assert.Equal(t, accountExists, true)

// Delete newly added Lambda
deleteOutput, httpResp, err := TESTAPICLIENT.AWSLogsIntegrationApi.DeleteAWSLambdaARN(TESTAUTH).AwsAccountAndLambdaInput(testLambdaAcc).Execute()
deleteOutput, httpresp, err := TESTAPICLIENT.AWSLogsIntegrationApi.DeleteAWSLambdaARN(TESTAUTH).AwsAccountAndLambdaRequest(testLambdaAcc).Execute()
if err != nil || httpresp.StatusCode != 200 {
t.Errorf("Error deleting Lambda %v: Response %s: %v", deleteOutput, err.(datadog.GenericOpenAPIError).Body(), err)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think Hippo has just changed it.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch! I went through PR #51 and cleaned up this + one other example I found in the GCP test. Should be all good now.

t.Errorf("Error Deleting Lambda %v: Status: %v: %v", deleteOutput, httpresp.StatusCode, err)
}
assert.Equal(t, httpResp.StatusCode, 200)
assert.Equal(t, httpresp.StatusCode, 200)

// List AWS logs integrations after deleting
listOutput2, httpResp, err := TESTAPICLIENT.AWSLogsIntegrationApi.AWSLogsList(TESTAUTH).Execute()
listOutput2, httpresp, err := TESTAPICLIENT.AWSLogsIntegrationApi.AWSLogsList(TESTAUTH).Execute()
if err != nil {
t.Errorf("Error listing log services: Response %s: %v", err.(datadog.GenericOpenAPIError).Body(), err)
}
assert.Equal(t, httpResp.StatusCode, 200)
assert.Equal(t, httpresp.StatusCode, 200)

var listOfARNs2 []datadog.AwsLogsListOutputLambdas
x = false
var listOfARNs2 []datadog.AwsLogsListResponseLambdas
var accountExistsAfterDelete = false
for _, Account := range listOutput2 {
if Account.GetAccountId() == *testAWSAcc.AccountId {
listOfARNs2 = Account.GetLambdas()
}
}
for _, lambda := range listOfARNs2 {
if lambda.GetArn() == testLambdaAcc.LambdaArn {
x = true
accountExistsAfterDelete = true
}
}
// Check that ARN no longer exists after delete
assert.Assert(t, x != true)
assert.Assert(t, accountExistsAfterDelete != true)
}

func TestCheckLambdaAsync(t *testing.T) {
// Setup the Client we'll use to interact with the Test account
teardownTest := setupTest(t)
defer teardownTest(t)

testAWSAcc, testLambdaAcc, _ := generateUniqueAwsLambdaAccounts()
defer uninstallAWSIntegration(testAWSAcc)

// Assert AWS Integration Created with proper fields
_, httpresp, err := TESTAPICLIENT.AWSIntegrationApi.CreateAWSAccount(TESTAUTH).AwsAccount(testAWSAcc).Execute()
if err != nil || httpresp.StatusCode != 200 {
gzussa marked this conversation as resolved.
Show resolved Hide resolved
t.Fatalf("Error creating AWS Account: Response %s: %v", err.(datadog.GenericOpenAPIError).Body(), err)
}

status, httpresp, err := TESTAPICLIENT.AWSLogsIntegrationApi.AWSLogsCheckLambdaAsync(TESTAUTH).AwsAccountAndLambdaRequest(testLambdaAcc).Execute()
if err != nil || httpresp.StatusCode != 200 {
t.Fatalf("Error checking the AWS Lambda: %v", err)
}
gzussa marked this conversation as resolved.
Show resolved Hide resolved

assert.Equal(t, len(status.GetErrors()), 0)
assert.Equal(t, status.GetStatus(), "created")

// Give the async call time to finish
time.Sleep(10 * time.Second)

status, httpresp, err = TESTAPICLIENT.AWSLogsIntegrationApi.AWSLogsCheckLambdaAsync(TESTAUTH).AwsAccountAndLambdaRequest(testLambdaAcc).Execute()
if err != nil || httpresp.StatusCode != 200 {
t.Fatalf("Error checking the AWS Lambda: %v", err)
}
gzussa marked this conversation as resolved.
Show resolved Hide resolved

assert.Assert(t, status.GetErrors()[0].GetCode() != "")
assert.Assert(t, status.GetErrors()[0].GetMessage() != "")
assert.Equal(t, status.GetStatus(), "error")
}

func TestCheckServicesAsync(t *testing.T) {
// Setup the Client we'll use to interact with the Test account
teardownTest := setupTest(t)
defer teardownTest(t)
testAWSAcc, _, testServices := generateUniqueAwsLambdaAccounts()
defer uninstallAWSIntegration(testAWSAcc)

// Assert AWS Integration Created with proper fields
_, httpresp, err := TESTAPICLIENT.AWSIntegrationApi.CreateAWSAccount(TESTAUTH).AwsAccount(testAWSAcc).Execute()
if err != nil || httpresp.StatusCode != 200 {
t.Fatalf("Error creating AWS Account: Response %s: %v", err.(datadog.GenericOpenAPIError).Body(), err)
}

status, httpresp, err := TESTAPICLIENT.AWSLogsIntegrationApi.AWSLogsCheckServicesAsync(TESTAUTH).AwsLogsServicesRequest(testServices).Execute()
if err != nil || httpresp.StatusCode != 200 {
t.Fatalf("Error checking the AWS Logs Services: %v", err)
}
gzussa marked this conversation as resolved.
Show resolved Hide resolved
assert.Assert(t, status.GetErrors()[0].GetCode() != "")
assert.Assert(t, status.GetErrors()[0].GetMessage() != "")
}
9 changes: 5 additions & 4 deletions api/v1/datadog/api_azure_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,12 +104,13 @@ func TestUpdateAzureAccount(t *testing.T) {
}
assert.Equal(t, httpresp.StatusCode, 200)

_, httpResp, err := TESTAPICLIENT.AzureIntegrationApi.UpdateAzureIntegration(TESTAUTH).AzureAccount(testUpdateAzureAcct).Execute()
_, httpresp, err = TESTAPICLIENT.AzureIntegrationApi.UpdateAzureIntegration(TESTAUTH).AzureAccount(testUpdateAzureAcct).Execute()
defer uninstallAzureIntegration(testUpdateAzureAcct)
if err != nil {
t.Errorf("Error updating Azure Account: Response %s: %v", err.(datadog.GenericOpenAPIError).Body(), err)
}
assert.Equal(t, httpResp.StatusCode, 200)

assert.Equal(t, httpresp.StatusCode, 200)

// List account to ensure update worked.
azureListOutput, _, err := TESTAPICLIENT.AzureIntegrationApi.ListAzureIntegration(TESTAUTH).Execute()
Expand All @@ -128,12 +129,12 @@ func TestUpdateAzureAccount(t *testing.T) {
assert.Equal(t, x.GetHostFilters(), *testUpdateAzureAcct.HostFilters)

// Test update host filters endpoint
_, httpResp, err = TESTAPICLIENT.AzureIntegrationApi.AzureUpdateHostFilters(TESTAUTH).AzureAccount(testAzureUpdateHostFilters).Execute()
_, httpresp, err = TESTAPICLIENT.AzureIntegrationApi.AzureUpdateHostFilters(TESTAUTH).AzureAccount(testAzureUpdateHostFilters).Execute()
if err != nil {
t.Errorf("Error updating Azure Host Filters: Response %s: %v", err.(datadog.GenericOpenAPIError).Body(), err)
}
assert.Equal(t, httpresp.StatusCode, 200)
HFListOutput, httpResp, err := TESTAPICLIENT.AzureIntegrationApi.ListAzureIntegration(TESTAUTH).Execute()
HFListOutput, httpresp, err := TESTAPICLIENT.AzureIntegrationApi.ListAzureIntegration(TESTAUTH).Execute()
if err != nil {
t.Errorf("Error listing Azure Accounts: Response %s: %v", err.(datadog.GenericOpenAPIError).Body(), err)
}
Expand Down
16 changes: 9 additions & 7 deletions api/v1/datadog/api_gcp_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ func TestGcpCreate(t *testing.T) {
testGCPAcct, _ := generateUniqueGcpAccount()
defer uninstallGcpIntegration(testGCPAcct)

_, httpResp, err := TESTAPICLIENT.GCPIntegrationApi.CreateGCPIntegration(TESTAUTH).GcpAccount(testGCPAcct).Execute()
_, httpresp, err := TESTAPICLIENT.GCPIntegrationApi.CreateGCPIntegration(TESTAUTH).GcpAccount(testGCPAcct).Execute()
if err != nil {
t.Fatalf("Error creating GCP integration: Response %s: %v", err.(datadog.GenericOpenAPIError).Body(), err)
}
assert.Equal(t, httpResp.StatusCode, 200)
assert.Equal(t, httpresp.StatusCode, 200)
}

func TestGcpListandDelete(t *testing.T) {
Expand Down Expand Up @@ -93,24 +93,26 @@ func TestUpdateGcpAccount(t *testing.T) {
defer uninstallGcpIntegration(testGCPAcct)

// Setup Gcp Account to Update
_, httpResp, err := TESTAPICLIENT.GCPIntegrationApi.CreateGCPIntegration(TESTAUTH).GcpAccount(testGCPAcct).Execute()
TESTAPICLIENT.GCPIntegrationApi.CreateGCPIntegration(TESTAUTH).GcpAccount(testGCPAcct).Execute()

_, httpresp, err := TESTAPICLIENT.GCPIntegrationApi.UpdateGCPIntegration(TESTAUTH).GcpAccount(testGCPUpdateAcct).Execute()
if err != nil {
t.Fatalf("Error creating GCP integration: Response %s: %v", err.(datadog.GenericOpenAPIError).Body(), err)
}
assert.Equal(t, httpResp.StatusCode, 200)
assert.Equal(t, httpresp.StatusCode, 200)

_, httpResp, err = TESTAPICLIENT.GCPIntegrationApi.UpdateGCPIntegration(TESTAUTH).GcpAccount(testGCPUpdateAcct).Execute()
_, httpresp, err = TESTAPICLIENT.GCPIntegrationApi.UpdateGCPIntegration(TESTAUTH).GcpAccount(testGCPUpdateAcct).Execute()
if err != nil {
t.Errorf("Error updating GCP integration: Response %s: %v", err.(datadog.GenericOpenAPIError).Body(), err)
}
assert.Equal(t, httpResp.StatusCode, 200)
assert.Equal(t, httpresp.StatusCode, 200)

// List account to ensure update worked.
gcpListOutput, _, err := TESTAPICLIENT.GCPIntegrationApi.ListGCPIntegration(TESTAUTH).Execute()
if err != nil {
t.Errorf("Error listing GCP accounts: Response %s: %v", err.(datadog.GenericOpenAPIError).Body(), err)
}
assert.Equal(t, httpResp.StatusCode, 200)
assert.Equal(t, httpresp.StatusCode, 200)
var x datadog.GcpAccount
for _, Account := range gcpListOutput {
if Account.GetClientEmail() == *testGCPAcct.ClientEmail {
Expand Down