Merge branch 'main' into refactor-installer

* main: chore: retire 7.15 adding 7.17 (elastic#1938) ci: use withAPMEnv (elastic#1917) Update main branch (elastic#1928) bump stack version 8.1.0-befff95a (elastic#1929) chore: properly evaluate how tests are skipped on CI when checking modified files (elastic#1924) bump stack version 8.1.0-60bffc32 (elastic#1921) fix: add resiliency when an integration cannot be added to a policy (elastic#1914)
mdelapenya · Dec 22, 2021 · 35e8811 · 35e8811
2 parents 3d0cbb8 + e5ec1f7
commit 35e8811
Show file tree

Hide file tree

Showing 25 changed files with 129 additions and 68 deletions.
diff --git a/.backportrc.json b/.backportrc.json
@@ -8,8 +8,8 @@
     "prTitle": "{commitMessages} backport for {targetBranch}",
     "targetBranchChoices": [
         { "name": "8.0", "checked": true },
-        { "name": "7.16", "checked": true },
-        { "name": "7.15", "checked": true }
+        { "name": "7.17", "checked": true },
+        { "name": "7.16", "checked": true }
     ],
     "targetPRLabels": ["backport"],
     "upstream": "elastic/e2e-testing"

diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile
@@ -37,7 +37,7 @@ pipeline {
     issueCommentTrigger("${obltGitHubComments()}")
   }
   parameters {
-    booleanParam(name: 'Run_As_Master_Branch', defaultValue: false, description: 'Allow to run any steps on a PR, some steps normally only run on master branch.')
+    booleanParam(name: 'Run_As_Main_Branch', defaultValue: false, description: 'Allow to run any steps on a PR, some steps normally only run on main branch.')
     booleanParam(name: "SKIP_SCENARIOS", defaultValue: true, description: "If it's needed to skip those scenarios marked as @skip. Default true")
     booleanParam(name: "NIGHTLY_SCENARIOS", defaultValue: false, description: "If it's needed to include the scenarios marked as @nightly in the test execution. Default false")
     string(name: 'runTestsSuites', defaultValue: '', description: 'A comma-separated list of test suites to run (default: empty to run all test suites)')
@@ -47,12 +47,12 @@ pipeline {
     booleanParam(name: "notifyOnGreenBuilds", defaultValue: false, description: "If it's needed to notify to Slack with green builds.")
     string(name: 'SLACK_CHANNEL', defaultValue: 'observablt-bots', description: 'The Slack channel(s) where errors will be posted. For multiple channels, use a comma-separated list of channels')
     string(name: 'ELASTIC_AGENT_DOWNLOAD_URL', defaultValue: '', description: 'If present, it will override the download URL for the Elastic agent artifact. (I.e. https://snapshots.elastic.co/8.0.0-59098054/downloads/beats/elastic-agent/elastic-agent-8.0.0-SNAPSHOT-linux-x86_64.tar.gz')
-    string(name: 'BEAT_VERSION', defaultValue: '8.1.0-f02e597e-SNAPSHOT', description: 'SemVer version of the Beat to be used for the tests. You can use here the tag of your PR to test your changes')
+    string(name: 'BEAT_VERSION', defaultValue: '8.1.0-befff95a-SNAPSHOT', description: 'SemVer version of the Beat to be used for the tests. You can use here the tag of your PR to test your changes')
     string(name: 'ELASTIC_AGENT_STALE_VERSION', defaultValue: '7.15-SNAPSHOT', description: 'SemVer version of the stale stand-alone elastic-agent to be used for Fleet upgrade tests.')
     choice(name: 'LOG_LEVEL', choices: ['DEBUG', 'TRACE', 'INFO'], description: 'Log level to be used')
     choice(name: 'TIMEOUT_FACTOR', choices: ['5', '3', '7', '11'], description: 'Max number of minutes for timeout backoff strategies')
     string(name: 'KIBANA_VERSION', defaultValue: '', description: 'Docker tag of the kibana to be used for the tests. It will refer to an image related to a Kibana PR, under the Observability-CI namespace')
-    string(name: 'STACK_VERSION', defaultValue: '8.1.0-f02e597e-SNAPSHOT', description: 'SemVer version of the stack to be used for the tests.')
+    string(name: 'STACK_VERSION', defaultValue: '8.1.0-befff95a-SNAPSHOT', description: 'SemVer version of the stack to be used for the tests.')
     string(name: 'HELM_CHART_VERSION', defaultValue: '7.11.2', description: 'SemVer version of Helm chart to be used.')
     string(name: 'HELM_VERSION', defaultValue: '3.5.2', description: 'SemVer version of Helm to be used.')
     string(name: 'KIND_VERSION', defaultValue: '0.10.0', description: 'SemVer version of Kind to be used.')
@@ -93,14 +93,7 @@ pipeline {
             githubCheckNotify('PENDING')  // we want to notify the upstream about the e2e the soonest
             stash allowEmpty: true, name: 'source', useDefaultExcludes: false
             setEnvVar("GO_VERSION", readFile("${env.WORKSPACE}/${env.BASE_DIR}/.go-version").trim())
-            dir("${BASE_DIR}"){
-              // Skip all the test stages for PR's with markdown changes only
-              setEnvVar("SKIP_TESTS", isGitRegionMatch(patterns: [ '.*\\.md' ], shouldMatchAll: true))
-              script {
-                def regexps = [ "^e2e/_suites/fleet/.*", "^e2e/_suites/helm/.*", "^e2e/_suites/kubernetes-autodiscover/.*", "^.ci/.*", "^cli/.*", "^e2e/.*\\.go", "^internal/.*\\.go" ]
-                setEnvVar("SKIP_TESTS", !isGitRegionMatch(patterns: regexps, shouldMatchAll: false))
-              }
-            }
+            checkSkipTests()
           }
         }
         stage('Pre-Submit') {
@@ -133,8 +126,10 @@ pipeline {
               options { skipDefaultCheckout() }
               when {
                 beforeAgent true
-                expression { return env.FORCE_SKIP_GIT_CHECKS == "true" }
-                expression { return env.SKIP_TESTS == "false" }
+                anyOf {
+                  expression { return env.FORCE_SKIP_GIT_CHECKS == "true" }
+                  expression { return env.SKIP_TESTS == "false" }
+                }
               }
               steps {
                 withGithubNotify(context: 'Tests', tab: 'tests') {
@@ -305,6 +300,23 @@ pipeline {
   }
 }
 
+// this function evaluates if the test stage of the build must be executed
+def checkSkipTests() {
+  dir("${BASE_DIR}"){
+
+    // only docs means no tests are run
+    if (isGitRegionMatch(patterns: [ '.*\\.md' ], shouldMatchAll: true)) {
+      setEnvVar("SKIP_TESTS", true)
+      return
+    }
+
+    // patterns for all places that should trigger a full build
+    def regexps = [ "^e2e/_suites/fleet/.*", "^e2e/_suites/helm/.*", "^e2e/_suites/kubernetes-autodiscover/.*", "^.ci/.*", "^cli/.*", "^e2e/.*\\.go", "^internal/.*\\.go" ]
+    setEnvVar("SKIP_TESTS", !isGitRegionMatch(patterns: regexps, shouldMatchAll: false))
+  }
+}
+
+
 def sshexec(workspace, connection, cmd){
   sh "ssh -tt -o TCPKeepAlive=yes -o ServerAliveInterval=60 -o ServerAliveCountMax=10 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i ${workspace}/e2essh ${connection.user}@${connection.ip} -- '${cmd}'"
 }
@@ -448,10 +460,10 @@ def generateFunctionalTestStep(Map args = [:]){
 
   // TODO: Is this still relevant?
   if (isPR() || isUpstreamTrigger(filter: 'PR-')) {
-    // when the "Run_As_Master_Branch" param is disabled, we will honour the PR filters, which
+    // when the "Run_As_Main_Branch" param is disabled, we will honour the PR filters, which
     // basically exclude some less frequent platforms or operative systems. If the user enabled
     // this param, the pipeline will remove the filters from the test runner.
-    if (!params.Run_As_Master_Branch) {
+    if (!params.Run_As_Main_Branch) {
       tags += pullRequestFilter
     }
   }
@@ -481,9 +493,11 @@ def generateFunctionalTestStep(Map args = [:]){
         unstash 'sourceEnvModified'
         withEnv(envContext) {
           // This step will help to send the APM traces to the
-          // APM service defined by the Otel Jenkins plugin.
+          // withOtelEnv is the one that uses the APM service defined by the Otel Jenkins plugin.
+          // withAPMEnv uses Vault to prepare the context.
+          // IMPORTANT: withAPMEnv is now the one in used since withOtelEnv uses a specific Opentelemetry Collector at the moment.
           // TODO: This will need to be integrated into the provisioned VMs
-          withOtelEnv() {
+          withAPMEnv() {
             // Start node, capture ip address
             ansible("${env.WORKSPACE}",
                     runId,

diff --git a/.ci/build-docker-images.groovy b/.ci/build-docker-images.groovy
@@ -25,7 +25,7 @@ pipeline {
     quietPeriod(10)
   }
   parameters {
-    string(name: 'BRANCH_SPECIFIER', defaultValue: 'master', description: 'It would not be defined on the first build, see JENKINS-41929.')
+    string(name: 'BRANCH_SPECIFIER', defaultValue: 'main', description: 'It would not be defined on the first build, see JENKINS-41929.')
   }
   triggers {
     cron 'H H(4-5) * * 1-5'

diff --git a/.ci/e2eFleetServer.groovy b/.ci/e2eFleetServer.groovy
@@ -159,7 +159,7 @@ def getE2EBaseBranch() {
   if (!prID.isInteger()) {
     // we are building a branch on Fleet Server
     setEnvVar('BASE_REF', prID)
-    // in the case we are triggering the job for a branch (i.e master, 7.16 we directly use branch name as Docker tag
+    // in the case we are triggering the job for a branch (i.e main, 7.16 we directly use branch name as Docker tag
     return prID
   }
 

diff --git a/.ci/e2eKibana.groovy b/.ci/e2eKibana.groovy
@@ -47,7 +47,7 @@ pipeline {
     )
   }
   parameters {
-    string(name: 'kibana_pr', defaultValue: "master", description: "PR ID to use to build the Docker image. (e.g 10000)")
+    string(name: 'kibana_pr', defaultValue: "main", description: "PR ID to use to build the Docker image. (e.g 10000)")
   }
   stages {
     stage('Initialize'){
@@ -150,7 +150,7 @@ def getDockerTagFromPayload() {
   def prID = getID()
 
   if (!prID.isInteger()) {
-    // in the case we are triggering the job for a branch (i.e master, 7.16) we directly use branch name as Docker tag
+    // in the case we are triggering the job for a branch (i.e main, 7.16) we directly use branch name as Docker tag
     setEnvVar("BASE_REF", prID)
     return prID
   }
@@ -186,7 +186,7 @@ def pushMultiPlatformManifest() {
   def dockerTag = "${env.DOCKER_TAG}"
 
   dir("${BASE_DIR}") {
-    def url = 'https://raw.githubusercontent.com/elastic/e2e-testing/master/.ci/scripts/push-multiplatform-manifest.sh'
+    def url = 'https://raw.githubusercontent.com/elastic/e2e-testing/main/.ci/scripts/push-multiplatform-manifest.sh'
     retryWithSleep(retries: 3, seconds: 5, backoff: true) {
       sh(label: 'Download script', script: "wget -q -O push-multiplatform-manifest.sh ${url}")
       sh(label: 'Grant permissions to script', script: "chmod +x push-multiplatform-manifest.sh")

diff --git a/.ci/jobs/build-docker-images.yml b/.ci/jobs/build-docker-images.yml
@@ -17,4 +17,4 @@
             credentials-id: f6c7695a-671e-4f4f-a331-acdce44ff9ba
             reference-repo: /var/lib/jenkins/.git-references/e2e-testing.git
             branches:
-              - master
+              - main
diff --git a/.ci/jobs/e2e-testing-fleet-daily-mbp.yml b/.ci/jobs/e2e-testing-fleet-daily-mbp.yml
@@ -9,7 +9,7 @@
     scm:
       - github:
           branch-discovery: no-pr
-          head-filter-regex: '(master|8\.0|7\.16|7\.15)'
+          head-filter-regex: '(main|8\.0|7\.17|7\.16)'
           discover-pr-forks-strategy: merge-current
           discover-pr-forks-trust: permission
           discover-pr-origin: merge-current

diff --git a/.ci/jobs/e2e-testing-helm-daily-mbp.yml b/.ci/jobs/e2e-testing-helm-daily-mbp.yml
@@ -9,7 +9,7 @@
     scm:
       - github:
           branch-discovery: no-pr
-          head-filter-regex: '(master|8\.0|7\.16|7\.15)'
+          head-filter-regex: '(main|8\.0|7\.17|7\.16)'
           discover-pr-forks-strategy: merge-current
           discover-pr-forks-trust: permission
           discover-pr-origin: merge-current

diff --git a/.ci/jobs/e2e-testing-k8s-autodiscovery-daily-mbp.yml b/.ci/jobs/e2e-testing-k8s-autodiscovery-daily-mbp.yml
@@ -9,7 +9,7 @@
     scm:
       - github:
           branch-discovery: no-pr
-          head-filter-regex: '(master|8\.0|7\.16|7\.15)'
+          head-filter-regex: '(main|8\.0|7\.17|7\.16)'
           discover-pr-forks-strategy: merge-current
           discover-pr-forks-trust: permission
           discover-pr-origin: merge-current

diff --git a/.ci/jobs/e2e-testing-mbp.yml b/.ci/jobs/e2e-testing-mbp.yml
@@ -14,7 +14,7 @@
     scm:
       - github:
           branch-discovery: no-pr
-          head-filter-regex: '(master|PR-.*|v\d\.d\.d|8\.0|7\.16|7\.15)'
+          head-filter-regex: '(main|PR-.*|v\d\.d\.d|8\.0|7\.17|7\.16)'
           discover-pr-forks-strategy: merge-current
           discover-pr-forks-trust: permission
           discover-pr-origin: merge-current

diff --git a/.ci/jobs/fleet-server-e2e-tests.yml b/.ci/jobs/fleet-server-e2e-tests.yml
@@ -14,5 +14,5 @@
             shallow-clone: true
             credentials-id: f6c7695a-671e-4f4f-a331-acdce44ff9ba
             branches:
-              - "master"
+              - "main"
     triggers: []
diff --git a/.ci/jobs/kibana-e2e-tests.yml b/.ci/jobs/kibana-e2e-tests.yml
@@ -14,5 +14,5 @@
             shallow-clone: true
             credentials-id: f6c7695a-671e-4f4f-a331-acdce44ff9ba
             branches:
-              - "master"
+              - "main"
     triggers: []
diff --git a/.mergify.yml b/.mergify.yml
@@ -21,7 +21,7 @@ pull_request_rules:
   - name: backport patches to 8.0 branch
     conditions:
       - merged
-      - base=master
+      - base=main
       - label=backport-v8.0.0
     actions:
       backport:
@@ -30,29 +30,29 @@ pull_request_rules:
         branches:
           - "8.0"
         title: "[{{ destination_branch }}](backport #{{ number }}) {{ title }}"
-  - name: backport patches to 7.16 branch
+  - name: backport patches to 7.17 branch
     conditions:
       - merged
-      - base=master
-      - label=backport-v7.16.0
+      - base=main
+      - label=backport-v7.17.0
     actions:
       backport:
         assignees:
           - "{{ author }}"
         branches:
           - "7.16"
         title: "[{{ destination_branch }}](backport #{{ number }}) {{ title }}"
-  - name: backport patches to 7.15 branch
+  - name: backport patches to 7.16 branch
     conditions:
       - merged
-      - base=master
-      - label=backport-v7.15.0
+      - base=main
+      - label=backport-v7.16.0
     actions:
       backport:
         assignees:
           - "{{ author }}"
         branches:
-          - "7.15"
+          - "7.16"
         title: "[{{ destination_branch }}](backport #{{ number }}) {{ title }}"
   - name: delete head branch after merge
     conditions:
@@ -91,7 +91,7 @@ pull_request_rules:
   - name: notify the backport policy
     conditions:
       - -label~=^backport
-      - base=master
+      - base=main
     actions:
       comment:
         message: |

diff --git a/.stack-version b/.stack-version
@@ -1 +1 @@
-8.1.0-f02e597e-SNAPSHOT
+8.1.0-befff95a-SNAPSHOT
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-[![Build Status](https://beats-ci.elastic.co/buildStatus/icon?job=e2e-tests%2Fe2e-testing-mbp%2Fmaster)](https://beats-ci.elastic.co/job/e2e-tests/job/e2e-testing-mbp/job/master/)
+[![Build Status](https://beats-ci.elastic.co/buildStatus/icon?job=e2e-tests%2Fe2e-testing-mbp%2Fmain)](https://beats-ci.elastic.co/job/e2e-tests/job/e2e-testing-mbp/job/main/)
 
 # End-2-End tests for the Observability projects
 

diff --git a/cli/README.md b/cli/README.md
@@ -116,7 +116,7 @@ Projects that have to build a dependency are harder to maintain, because the way
 If we are able to remove this build part on a consumer, then the code base would be simpler, increasing how it's used by developers.
 
 #### Build time
-Projects that have to build a dependency uses more CI time, as they have to build the dependencies each time the CI triggers a job, be it a PR or branch. It's true that Jenkins (an other CI providers) allows to skip stages depending on conditions, but in the end we always need to build the dependencies at some point (probably at the merge to master).
+Projects that have to build a dependency uses more CI time, as they have to build the dependencies each time the CI triggers a job, be it a PR or branch. It's true that Jenkins (an other CI providers) allows to skip stages depending on conditions, but in the end we always need to build the dependencies at some point (probably at the merge to main).
 
 If we are able to remove this build part on a consumer, then the CI build will take less time to finish, as we will consume already published artefacts instead of building them. The pull time will be taken into consideration too, but it would be way faster than the build time.
 

diff --git a/cli/config/compose/profiles/fleet/docker-compose.yml b/cli/config/compose/profiles/fleet/docker-compose.yml
@@ -16,7 +16,7 @@ services:
       - xpack.security.authc.api_key.enabled=true
       - ELASTIC_USERNAME=elastic
       - ELASTIC_PASSWORD=changeme
-    image: "docker.elastic.co/elasticsearch/elasticsearch:${stackVersion:-8.1.0-f02e597e-SNAPSHOT}"
+    image: "docker.elastic.co/elasticsearch/elasticsearch:${stackVersion:-8.1.0-befff95a-SNAPSHOT}"
     platform: ${stackPlatform:-linux/amd64}
     ports:
       - "9200:9200"
@@ -28,14 +28,14 @@ services:
       test: "curl -f http://localhost:5601/login | grep kbn-injected-metadata 2>&1 >/dev/null"
       retries: 600
       interval: 1s
-    image: "docker.elastic.co/${kibanaDockerNamespace:-kibana}/kibana:${kibanaVersion:-8.1.0-f02e597e-SNAPSHOT}"
+    image: "docker.elastic.co/${kibanaDockerNamespace:-kibana}/kibana:${kibanaVersion:-8.1.0-befff95a-SNAPSHOT}"
     platform: ${stackPlatform:-linux/amd64}
     ports:
       - "5601:5601"
     volumes:
       - ./${kibanaProfile:-default}/kibana.config.yml:/usr/share/kibana/config/kibana.yml
   fleet-server:
-    image: "docker.elastic.co/beats/elastic-agent:${stackVersion:-8.1.0-f02e597e-SNAPSHOT}"
+    image: "docker.elastic.co/beats/elastic-agent:${stackVersion:-8.1.0-befff95a-SNAPSHOT}"
     depends_on:
       elasticsearch:
         condition: service_healthy

diff --git a/cli/config/compose/profiles/metricbeat/docker-compose.yml b/cli/config/compose/profiles/metricbeat/docker-compose.yml
@@ -9,7 +9,7 @@ services:
       - xpack.monitoring.collection.enabled=true
       - ELASTIC_USERNAME=elastic
       - ELASTIC_PASSWORD=changeme
-    image: "docker.elastic.co/elasticsearch/elasticsearch:${stackVersion:-8.1.0-f02e597e-SNAPSHOT}"
+    image: "docker.elastic.co/elasticsearch/elasticsearch:${stackVersion:-8.1.0-befff95a-SNAPSHOT}"
     platform: ${stackPlatform:-linux/amd64}
     ports:
       - "9200:9200"
diff --git a/cli/config/kubernetes/base/elasticsearch/deployment.yaml b/cli/config/kubernetes/base/elasticsearch/deployment.yaml
@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
       - name: elasticsearch
-        image: docker.elastic.co/elasticsearch/elasticsearch:8.1.0-f02e597e-SNAPSHOT
+        image: docker.elastic.co/elasticsearch/elasticsearch:8.1.0-befff95a-SNAPSHOT
         envFrom:
           - configMapRef:
               name: elasticsearch-config

diff --git a/cli/config/kubernetes/base/fleet-server/deployment.yaml b/cli/config/kubernetes/base/fleet-server/deployment.yaml
@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
       - name: fleet-server
-        image: docker.elastic.co/beats/elastic-agent:8.1.0-f02e597e-SNAPSHOT
+        image: docker.elastic.co/beats/elastic-agent:8.1.0-befff95a-SNAPSHOT
         env:
         - name: FLEET_SERVER_ENABLE
           value: "1"

diff --git a/cli/config/kubernetes/base/kibana/deployment.yaml b/cli/config/kubernetes/base/kibana/deployment.yaml
@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
       - name: kibana
-        image: docker.elastic.co/kibana/kibana:8.1.0-f02e597e-SNAPSHOT
+        image: docker.elastic.co/kibana/kibana:8.1.0-befff95a-SNAPSHOT
         env:
         - name: ELASTICSEARCH_URL
           value: http://elasticsearch:9200

diff --git a/e2e/README.md b/e2e/README.md
@@ -149,7 +149,7 @@ In the following example, we will run the Fleet tests for the 8.0.0-SNAPSHOT sta
 
 ```shell
 # Use the proper branch
-git checkout master
+git checkout main
 # Run the tests for a specific branch
 TAGS="fleet_mode_agent" \
     TIMEOUT_FACTOR=3 LOG_LEVEL=TRACE \
@@ -159,7 +159,7 @@ TAGS="fleet_mode_agent" \
 Or running by feature file:
 ```shell
 # Use the proper branch
-git checkout master
+git checkout main
 FEATURES="fleet_mode_agent.feature" \
     TIMEOUT_FACTOR=3 LOG_LEVEL=TRACE \
     BEAT_VERSION="7.10.1" \
@@ -191,7 +191,7 @@ To do so:
 
 1. Navigate to Jenkins: https://beats-ci.elastic.co/job/e2e-tests/job/e2e-testing-mbp/
 1. Login as a user
-1. Select the base branch for the test code: master (for 8.0.0-SNAPSHOT), 7.16, or any other maintenance branch.
+1. Select the base branch for the test code: main (for 8.0.0-SNAPSHOT), 7.16, or any other maintenance branch.
 1. In the left menu, click on `Buid with Parameters`.
 1. In the input parameters form, set the stack version (for Fleet) using the specific variables for the test suite.
 1. (Optional) Set the product version (Fleet or Helm charts) using the specific variables for the test suite if you want to consume a different artifact.
@@ -209,7 +209,7 @@ To do so:
 
 1. Navigate to Jenkins: https://beats-ci.elastic.co/job/e2e-tests/job/e2e-testing-mbp/
 1. Login as a user
-1. Select the base branch for the test code: 7.14, 7.15, 7.16 or master.
+1. Select the base branch for the test code: 7.14, 7.15, 7.16 or main.
 1. In the left menu, click on `Buid with Parameters`.
 1. In the input parameters form, keep the Beat version (for Fleet) as is, to use each branch's default version.
 1. In the input parameters form, keep the stack version (for Fleet) as is, to use each branch's default version.

diff --git a/e2e/_suites/fleet/fleet.go b/e2e/_suites/fleet/fleet.go
@@ -1010,7 +1010,8 @@ func theIntegrationIsOperatedInThePolicy(ctx context.Context, client *kibana.Cli
 			log.WithFields(log.Fields{
 				"err":       err,
 				"packageDS": packageDataStream,
-			}).Fatal("Unable to add integration to policy")
+			}).Error("Unable to add integration to policy")
+			return err
 		}
 	} else if strings.ToLower(action) == actionREMOVED {
 		packageDataStream, err := client.GetIntegrationFromAgentPolicy(ctx, integration.Name, policy)