Proto changes to pass proxy connection_string to compliance service (#6641)

* proxy_proto changes

Signed-off-by: Vivek Shankar <[email protected]>

* proto breaking change

Signed-off-by: Vivek Shankar <[email protected]>

Author: vivekshankar1

api/config/compliance/config_request.go

@@ -17,6 +17,7 @@ func NewConfigRequest() *ConfigRequest {
 				Logger:   &ConfigRequest_V1_System_Logger{},
 				Agent:    &ConfigRequest_V1_System_Agent{},
 				Profiles: &ConfigRequest_V1_System_Profiles{},
+				Proxy:    &ConfigRequest_V1_System_Proxy{},
 			},
 			Svc: &ConfigRequest_V1_Service{},
 		},
@@ -82,7 +83,8 @@ func (c *ConfigRequest) PrepareSystemConfig(creds *config.TLSCredentials) (confi
 // SetGlobalConfig imports settings from the global configuration
 func (c *ConfigRequest) SetGlobalConfig(g *config.GlobalConfig) {
 	c.V1.Sys.Mlsa = g.V1.Mlsa
-	c.V1.Sys.Proxy = g.V1.Proxy
+	c.V1.Sys.Proxy.ConnectionString = g.ProxyString()
+	c.V1.Sys.Proxy.NoProxyString = g.NoProxyString()
 	c.V1.Sys.Service.ExternalFqdn = g.V1.GetFqdn()
 
 	if logLevel := g.GetV1().GetLog().GetLevel().GetValue(); logLevel != "" {

api/config/compliance/config_request.pb.go

@@ -36,7 +36,7 @@ message ConfigRequest {
 			reserved 8;
 			reserved 9;
 			Agent agent = 10;
-			chef.automate.infra.config.Proxy proxy = 11;
+			Proxy proxy = 11;
 
 			message Service {
 				google.protobuf.StringValue host = 1 [deprecated=true]; // The listen host is no longer setable(localhost only)
@@ -45,6 +45,11 @@ message ConfigRequest {
 				google.protobuf.Int32Value message_buffer_size = 8;
 			}
 
+			message Proxy {
+				google.protobuf.StringValue connection_string = 1;
+				google.protobuf.StringValue no_proxy_string = 2;
+			}
+
 			message Profiles {
 				reserved 1;
 				google.protobuf.BoolValue install_market_profiles = 2;

api/config/compliance/config_request.proto

@@ -443,4 +443,5 @@ breaking:
     - external/compliance/reporting/reporting.proto
     - config/ui/config_request.proto
     - external/compliance/reporting/stats/stats.proto
+    - config/compliance/config_request.proto
 

buf.yaml

@@ -20,6 +20,5 @@ declare namespace Cypress {
     waitUntilNodemanagerNodeIsDeleted(nodeName: string): void
     waitUntilConfigMgmtNodeIsDeleted(clientRunsNodeId: string): void
     sendToDataCollector(report: any): void
-    uploadFileRequest(fileToUpload: any, uniqueName: any, aliasName: any): void
   }
 }

e2e/cypress/fixtures/testproxy-0.1.0.tar.gz

@@ -8,7 +8,6 @@
     "cypress:local": "CYPRESS_BASE_URL=https://a2-dev.test CYPRESS_RUN_FLAKY=no cypress open",
     "cypress:local:flaky": "CYPRESS_BASE_URL=https://a2-dev.test CYPRESS_RUN_FLAKY=yes cypress open",
     "cypress:run": "cypress run",
-    "cypress:run:proxy": "CYPRESS_IS_PROXY_ENV=true cypress run --spec cypress/integration/api/compliance/ssh_scan_job_proxy.spec.ts",
     "cypress:record": "cypress run --record",
     "lint": "tslint -p tsconfig.json"
   },

e2e/cypress/index.d.ts

@@ -19,27 +19,6 @@ do_deploy() {
     chef-automate license apply "$A2_LICENSE"
 
     echo "127.0.0.1 ${CONTAINER_HOSTNAME}" >> /etc/hosts
-
-    timestamp=$(date +"%m-%d-%y-%H-%M")
-
-    log_info "generating admin token"
-    if ! token=$(chef-automate iam token create "$timestamp-tok" --admin); then
-        log_error "Non-zero exit code, output:"
-        log_error "$token"
-        return 1
-    fi
-
-    export CYPRESS_ADMIN_TOKEN=$token
-    export CYPRESS_RUN_FLAKY=$FLAKY
-
-    log_info "fixing dns resolution for '${CONTAINER_HOSTNAME}'"
-    echo "127.0.0.1 ${CONTAINER_HOSTNAME}" >> /etc/hosts
-    # shellcheck disable=SC2154
-    proxyurl="http://${test_proxy_container_name}:3128"
-    echo "export http_proxy=${proxyurl}" >> ~/.bashrc
-    echo "export https_proxy=${proxyurl}" >> ~/.bashrc
-    #shellcheck disable=SC1090
-    source ~/.bashrc
 }
 
 do_test_deploy() {
@@ -48,15 +27,5 @@ do_test_deploy() {
     source "${source_dir}/helpers/bldr_tests.sh"
 
     do_test_deploy_default
-
-    log_info "running cypress in e2e"
-    cd "${A2_ROOT_DIR}/e2e" || return 1
-    export CYPRESS_SKIP_SSO=true
-    export CYPRESS_BASE_URL="https://$CONTAINER_HOSTNAME"
-
-    npm install # get dependencies defined in e2e/package.json
-    if ! npm run cypress:run:proxy; then
-        buildkite-agent artifact upload "cypress/videos/*;cypress/videos/**/*;cypress/screenshots/*;cypress/screenshots/**/*"
-        return 1
-    fi
+    bldr_smoke_test
 }