fix pr comments

elastic · Feb 8, 2024 · b33f1bd · b33f1bd
1 parent 7cfd60b
commit b33f1bd
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/internal/certs/certs.go b/internal/certs/certs.go
@@ -328,8 +328,8 @@ func checkExpectedCertUsage(cert *x509.Certificate) error {
 	if !cert.IsCA {
 		// Required for Chrome in OSX to show the "Proceed anyway" link.
 		// https://stackoverflow.com/a/64309893/28855
-		if !containsExtKeyUsage(cert.ExtKeyUsage, x509.ExtKeyUsageServerAuth) {
-			return fmt.Errorf("missing server auth key usage in certificate")
+		if !containsExtKeyUsage(cert.ExtKeyUsage, x509.ExtKeyUsageServerAuth) || !containsExtKeyUsage(cert.ExtKeyUsage, x509.ExtKeyUsageClientAuth) {
+			return fmt.Errorf("missing either of server/client auth key usage in certificate")
 		}
 	}
 

diff --git a/internal/serverless/project.go b/internal/serverless/project.go
@@ -232,7 +232,7 @@ func (p *Project) getFleetHealth(ctx context.Context) error {
 	return nil
 }
 
-func (p *Project) CreateAgentPolicy(stackVersion string, kibanaClient *kibana.Client, logstashEnabled bool) error {
+func (p *Project) CreateAgentPolicy(stackVersion string, kibanaClient *kibana.Client, outputId string) error {
 	systemPackages, err := registry.Production.Revisions("system", registry.SearchOptions{
 		KibanaVersion: strings.TrimSuffix(stackVersion, kibana.SNAPSHOT_SUFFIX),
 	})
@@ -250,10 +250,7 @@ func (p *Project) CreateAgentPolicy(stackVersion string, kibanaClient *kibana.Cl
 		Description:       "Policy created by elastic-package",
 		Namespace:         "default",
 		MonitoringEnabled: []string{"logs", "metrics"},
-	}
-
-	if logstashEnabled {
-		policy.DataOutputID = FleetLogstashOutput
+		DataOutputID:      outputId,
 	}
 
 	newPolicy, err := kibanaClient.CreatePolicy(policy)

diff --git a/internal/stack/serverless.go b/internal/stack/serverless.go
@@ -269,8 +269,13 @@ func (sp *serverlessProvider) BootUp(options Options) error {
 			return fmt.Errorf("failed to retrieve latest project created: %w", err)
 		}
 
+		outputID := ""
+		if settings.LogstashEnabled {
+			outputID = serverless.FleetLogstashOutput
+		}
+
 		logger.Infof("Creating agent policy")
-		err = project.CreateAgentPolicy(options.StackVersion, sp.kibanaClient, settings.LogstashEnabled)
+		err = project.CreateAgentPolicy(options.StackVersion, sp.kibanaClient, outputID)
 
 		if err != nil {
 			return fmt.Errorf("failed to create agent policy: %w", err)