Environments List search bar changes

.expeditor/verify_private.pipeline.yml

@@ -429,6 +429,23 @@ steps:
             - HAB_STUDIO_SUP=false
             - HAB_NONINTERACTIVE=true
 
+  - label: "infra-proxy-service"
+    command:
+      - . scripts/verify_setup.sh
+      - hab studio run "source scripts/verify_studio_init.sh && start_deployment_service && chef-automate dev deployinate && infra_service_integration"
+    timeout_in_minutes: 20
+    retry:
+      automatic:
+        limit: 1
+    expeditor:
+      executor:
+        docker:
+          privileged: true
+          environment:
+            - HAB_STUDIO_SUP=false
+            - HAB_NONINTERACTIVE=true
+            - CONTAINER_HOSTNAME=localhost
+
   #
   # The following tests all use the integration test framework for
   # end-to-end testing. These tests all test full deployments of

.studio/infra-proxy-service

@@ -11,6 +11,18 @@ function start_infra_proxy_service() {
   chef-automate dev deploy-some $HAB_ORIGIN/infra-proxy-service --with-deps
 }
 
+document "infra_service_integration" <<DOC
+  run the infra service's integration tests
+DOC
+function infra_service_integration() {
+  check_if_deployinate_started || return 1;
+  export CONTAINER_HOSTNAME=localhost
+  # Setup local chef server
+  # loads data which resides in dev-docs/adding-data/infra/chef-repo
+  infra_service_load_chef_repo
+  A2_SVC_NAME="infra-proxy-service" A2_SVC_PATH="/hab/svc/infra-proxy-service" go_test "github.com/chef/automate/components/infra-proxy-service/integration_test"
+}
+
 document "infra_service_load_sample_data" <<DOC
   Before running this command make sure either run 'start_infra_proxy_service' or 'start_all_services'
   Hits the create server & org endpoint inside the infra-proxy-service. (CreateServer & CreateOrg)
@@ -73,17 +85,17 @@ function infra_service_load_sample_data() {
 }
 
 function infra_service_create_servers_orgs() {
-  chef-automate dev grpcurl automate-gateway -- -d \
+  chef-automate dev grpcurl infra-proxy-service -- -d \
   "$(cat << EOF
     {"id": "$1", "name": "$2", "ip_address": "$3", "fqdn": "$4"}
 EOF
-  )" chef.automate.api.infra_proxy.InfraProxy.CreateServer >/dev/null
+  )" chef.automate.domain.infra_proxy.service.InfraProxyService.CreateServer >/dev/null
 
-  chef-automate dev grpcurl automate-gateway -- -d \
+  chef-automate dev grpcurl infra-proxy-service -- -d \
   "$(cat << EOF
     {"id": "$5", "name": "$6", "admin_user": "$7", "admin_key": "$8", "server_id": "$1", "projects": []}
 EOF
-  )" chef.automate.api.infra_proxy.InfraProxy.CreateOrg >/dev/null
+  )" chef.automate.domain.infra_proxy.service.InfraProxyService.CreateOrg >/dev/null
 }
 
 function infra_service_load_chef_repo() {
@@ -159,6 +171,10 @@ EOH
 source "https://supermarket.chef.io"
 
 cookbook "audit"
+cookbook "chef-client"
+cookbook "iptables"
+cookbook "netdev"
+cookbook "sudo"
 EOH
 
   if ! hab pkg exec chef/chef-dk knife opc user list -c ${chef_server_pivotal_rb_path} | grep ${chef_server_test_node_name} &> /dev/null; then

.studio/notifications-service

@@ -38,6 +38,14 @@ function notifications_lint() {
   return $EXIT_CODE
 }
 
+document "notifications_integration" <<DOC
+  run the notifications service's integration tests
+DOC
+function notifications_integration() {
+  check_if_deployinate_started || return 1;
+  A2_SVC_NAME="notifications-service" A2_SVC_PATH="/hab/svc/notifications-service" go_test "github.com/chef/automate/components/notifications-service/integration_test"
+}
+
 document "notifications_compile_protobuf" <<DOC
   create the protobuf files for the notifications-service and notifications-client.
   This was copied from both of the components Make files.
@@ -105,10 +113,8 @@ document "notifications_update_component" <<DOC
   Warning: this does not work for new files. If you create a new file run rebuild components/notifications-service
 DOC
 function notifications_update_component() {
-  component_path=$(hab pkg path "$HAB_ORIGIN"/notifications-service 2> /dev/null)
-  if [[ $? -ne 0 ]]; then
-    component_path=$(hab pkg path chef/notifications-service 2> /dev/null)
-    if [[ $? -ne 0 ]]; then
+  if ! component_path=$(hab pkg path "$HAB_ORIGIN"/notifications-service 2> /dev/null); then 
+    if ! component_path=$(hab pkg path chef/notifications-service 2> /dev/null); then
       error "Could not find notifications-service deployed under either your origin ($HAB_ORIGIN) or chef origin."
       error "Deploy A2 and try again."
       return 1
@@ -117,12 +123,12 @@ function notifications_update_component() {
 
   elixir_install
 
-  pushd /src/components/notifications-service/server >/dev/null
+  pushd /src/components/notifications-service/server >/dev/null || return 1
     mix local.hex --force
     mix local.rebar --force
     MIX_ENV=habitat mix "do" deps.get, compile
     returnStatus=$?
-  popd >/dev/null
+  popd >/dev/null || return 1
 
   if [[ $returnStatus == 0 ]]; then
     log_line "reload the notifications-service binary."

api/config/erchef/config_request.go

@@ -5,7 +5,9 @@ import (
 	"strings"
 
 	ac "github.com/chef/automate/api/config/shared"
+	config "github.com/chef/automate/api/config/shared"
 	w "github.com/chef/automate/api/config/shared/wrappers"
+	"github.com/chef/automate/lib/stringutils"
 )
 
 // NewConfigRequest returns a new instance of ConfigRequest with zero values.
@@ -144,3 +146,11 @@ func (c *ConfigRequest) PrepareSystemConfig(creds *ac.TLSCredentials) (ac.Prepar
 
 	return c.V1.Sys, nil
 }
+
+func (c *ConfigRequest) ConfigureProduct(productConfig *config.ProductConfig) {
+	if len(productConfig.Products) > 0 {
+		if !c.V1.Sys.GetExternalAutomate().GetEnable().GetValue() && !stringutils.SliceContains(productConfig.Products, "automate") {
+			c.V1.Sys.DataCollector.Enabled = w.Bool(false)
+		}
+	}
+}

api/config/erchef/config_request_test.go

@@ -3,11 +3,42 @@ package erchef
 import (
 	"testing"
 
+	"github.com/chef/automate/api/config/shared"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
+	w "github.com/chef/automate/api/config/shared/wrappers"
 )
 
 func TestValidateConfigRequestValid(t *testing.T) {
 	c := NewConfigRequest()
 	err := c.Validate()
 	assert.Nil(t, err)
 }
+
+func TestDataCollector(t *testing.T) {
+	t.Run("enabled when External Automate is enabled and Internal Automate is disabled", func(t *testing.T) {
+		c := DefaultConfigRequest()
+		c.V1.Sys.ExternalAutomate = &shared.External_Automate{
+			Enable: w.Bool(true),
+		}
+		c.ConfigureProduct(&shared.ProductConfig{
+			Products: []string{"chef-server"},
+		})
+		require.True(t, c.V1.Sys.GetDataCollector().GetEnabled().GetValue())
+	})
+	t.Run("enabled when External Automate is disabled and Internal Automate is enabled", func(t *testing.T) {
+		c := DefaultConfigRequest()
+		c.ConfigureProduct(&shared.ProductConfig{
+			Products: []string{"automate", "chef-server"},
+		})
+		require.True(t, c.V1.Sys.GetDataCollector().GetEnabled().GetValue())
+	})
+	t.Run("disabled when External Automate is disabled and Internal Automate is disabled", func(t *testing.T) {
+		c := DefaultConfigRequest()
+		c.ConfigureProduct(&shared.ProductConfig{
+			Products: []string{"chef-server"},
+		})
+		require.False(t, c.V1.Sys.GetDataCollector().GetEnabled().GetValue())
+	})
+}