Merge pull request #191 from lacework/afiune/cli/v0.2

Lacework CLI v0.2

Author: afiune

VERSION

@@ -1 +1 @@
-0.1.25-dev
+0.2.0-dev

api/_examples/host-vuln-list-cves/main.go

@@ -0,0 +1,35 @@
+package main
+
+import (
+	"flag"
+	"fmt"
+	"log"
+
+	"github.com/lacework/go-sdk/api"
+)
+
+var (
+	account   string
+	apiKey    string
+	apiSecret string
+)
+
+func main() {
+	flag.StringVar(&account, "account", "", "Lacework Account")
+	flag.StringVar(&apiKey, "api_key", "", "Lacework API Key")
+	flag.StringVar(&apiSecret, "api_secret", "", "Lacework API Secret")
+	flag.Parse()
+
+	lacework, err := api.NewClient(account, api.WithApiKeys(apiKey, apiSecret))
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	response, err := lacework.Vulnerabilities.Host.ListCves()
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	// Output:
+	fmt.Println(response)
+}

api/api.go

@@ -25,17 +25,22 @@ import (
 )
 
 const (
-	apiIntegrations       = "external/integrations"
-	apiIntegrationsByType = "external/integrations/type/%s"
-	apiIntegrationByGUID  = "external/integrations/%s"
-	apiIntegrationSchema  = "external/integrations/schema/%s"
-	apiTokens             = "access/tokens"
+	apiIntegrations        = "external/integrations"
+	apiIntegrationsByType  = "external/integrations/type/%s"
+	apiIntegrationFromGUID = "external/integrations/%s"
+	apiIntegrationSchema   = "external/integrations/schema/%s"
+	apiTokens              = "access/tokens"
 
-	apiVulnerabilitiesScan             = "external/vulnerabilities/container/repository/images/scan"
-	apiVulnerabilitiesScanStatus       = "external/vulnerabilities/container/reqId/%s"
-	apiVulnerabilitiesReportFromID     = "external/vulnerabilities/container/imageId/%s"
-	apiVulnerabilitiesReportFromDigest = "external/vulnerabilities/container/imageDigest/%s"
-	apiVulEvaluationsForDateRange      = "external/vulnerabilities/container/GetEvaluationsForDateRange"
+	apiVulnerabilitiesContainerScan             = "external/vulnerabilities/container/repository/images/scan"
+	apiVulnerabilitiesContainerScanStatus       = "external/vulnerabilities/container/reqId/%s"
+	apiVulnerabilitiesAssessmentFromImageID     = "external/vulnerabilities/container/imageId/%s"
+	apiVulnerabilitiesAssessmentFromImageDigest = "external/vulnerabilities/container/imageDigest/%s"
+	apiVulnContainerAssessmentsForDateRange     = "external/vulnerabilities/container/GetAssessmentsForDateRange"
+
+	apiVulnerabilitiesScanPkgManifest             = "external/vulnerabilities/scan"
+	apiVulnerabilitiesHostListCves                = "external/vulnerabilities/host"
+	apiVulnerabilitiesListHostsWithCveID          = "external/vulnerabilities/host/cveId/%s"
+	apiVulnerabilitiesHostAssessmentFromMachineID = "external/vulnerabilities/host/machineId/%s"
 
 	apiComplianceAwsLatestReport        = "external/compliance/aws/GetLatestComplianceReport?AWS_ACCOUNT_ID=%s"
 	apiComplianceGcpLatestReport        = "external/compliance/gcp/GetLatestComplianceReport?GCP_ORG_ID=%s&GCP_PROJ_ID=%s"

api/client.go

@@ -95,7 +95,7 @@ func NewClient(account string, opts ...Option) (*Client, error) {
 	c.Events = &EventsService{c}
 	c.Compliance = &ComplianceService{c}
 	c.Integrations = &IntegrationsService{c}
-	c.Vulnerabilities = &VulnerabilitiesService{c}
+	c.Vulnerabilities = NewVulnerabilityService(c)
 
 	// init logger, this could change if a user calls api.WithLogLevel()
 	c.initLogger()

api/integrations.go

@@ -144,7 +144,7 @@ func (svc *IntegrationsService) GetSchema(iType integrationType) (
 }
 
 func (svc *IntegrationsService) get(guid string, response interface{}) error {
-	apiPath := fmt.Sprintf(apiIntegrationByGUID, guid)
+	apiPath := fmt.Sprintf(apiIntegrationFromGUID, guid)
 	return svc.client.RequestDecoder("GET", apiPath, nil, response)
 }
 
@@ -160,7 +160,7 @@ func (svc *IntegrationsService) create(data interface{}, response interface{}) e
 
 func (svc *IntegrationsService) update(guid string, data interface{}, response interface{}) error {
 	var (
-		apiPath   = fmt.Sprintf(apiIntegrationByGUID, guid)
+		apiPath   = fmt.Sprintf(apiIntegrationFromGUID, guid)
 		body, err = jsonReader(data)
 	)
 	if err != nil {
@@ -171,7 +171,7 @@ func (svc *IntegrationsService) update(guid string, data interface{}, response i
 }
 
 func (svc *IntegrationsService) delete(guid string, response interface{}) error {
-	apiPath := fmt.Sprintf(apiIntegrationByGUID, guid)
+	apiPath := fmt.Sprintf(apiIntegrationFromGUID, guid)
 	return svc.client.RequestDecoder("DELETE", apiPath, nil, response)
 }
 

api/version.go

@@ -20,6 +20,7 @@ package api_test
 
 import (
 	"io/ioutil"
+	"strings"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -30,6 +31,6 @@ import (
 func TestVersionMatchVERSIONfile(t *testing.T) {
 	expectedVersion, err := ioutil.ReadFile("../VERSION")
 	assert.Nil(t, err)
-	assert.Equalf(t, string(expectedVersion), subject.Version,
+	assert.Equalf(t, strings.TrimSuffix(string(expectedVersion), "\n"), subject.Version,
 		"api/version.go doesn't match with VERSION file; run scripts/version_updater.sh")
 }