Skip to content

Commit 42c613b

Browse files
authored
Use containsOnce for metadata e2e expected files (#13815)
Migrate outer-level contains to containsOnce in service, instance, endpoint, and topology expected files (101 files). containsOnce uses backtracking for optimal 1:1 assignment between expected and actual entries, which is more precise for metadata where we know exactly which entries should exist. Inner nested contains (layers, tags, etc.) are left unchanged.
1 parent 7abe7b3 commit 42c613b

101 files changed

Lines changed: 125 additions & 125 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

test/e2e-v2/cases/activemq/expected/endpoint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515

16-
{{- contains .}}
16+
{{- containsOnce .}}
1717
- id: {{ b64enc "activemq::activemq-cluster" }}.1_{{ b64enc "testQueue" }}
1818
name: testQueue
1919
- id: {{ b64enc "activemq::activemq-cluster" }}.1_{{ b64enc "testTopic" }}

test/e2e-v2/cases/activemq/expected/instance.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515

16-
{{- contains . }}
16+
{{- containsOnce . }}
1717
- id: {{ notEmpty .id }}
1818
name: activemq-broker
1919
instanceuuid: {{ notEmpty .instanceuuid }}

test/e2e-v2/cases/activemq/expected/service.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515

16-
{{- contains . }}
16+
{{- containsOnce . }}
1717
- id: {{ b64enc "activemq::activemq-cluster" }}.1
1818
name: activemq::activemq-cluster
1919
group: activemq

test/e2e-v2/cases/alarm/expected/service.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515

16-
{{- contains . }}
16+
{{- containsOnce . }}
1717
- id: {{ b64enc "e2e-service-provider" }}.1
1818
name: e2e-service-provider
1919
group: ""

test/e2e-v2/cases/apisix/expected/instance.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515

16-
{{- contains . }}
16+
{{- containsOnce . }}
1717
- id: {{ notEmpty .id }}
1818
name: {{ notEmpty .name }}
1919
instanceuuid: {{ notEmpty .instanceuuid }}

test/e2e-v2/cases/apisix/expected/service.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515

16-
{{- contains . }}
16+
{{- containsOnce . }}
1717
- id: {{ b64enc "APISIX::showcase-apisix-service" }}.1
1818
name: APISIX::showcase-apisix-service
1919
shortname: showcase-apisix-service

test/e2e-v2/cases/aws/api-gateway/expected/service.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515

16-
{{- contains . }}
16+
{{- containsOnce . }}
1717
- id: {{ b64enc "aws-api-gateway::$default:6m85d5acx7" }}.1
1818
name: "aws-api-gateway::$default:6m85d5acx7"
1919
group: aws-api-gateway

test/e2e-v2/cases/aws/dynamodb/expected/service.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515

16-
{{- contains . }}
16+
{{- containsOnce . }}
1717
- id: {{ b64enc "aws-dynamodb::xxxxxxxx" }}.1
1818
name: aws-dynamodb::xxxxxxxx
1919
group: aws-dynamodb

test/e2e-v2/cases/aws/eks/expected/endpoint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515

16-
{{- contains .}}
16+
{{- containsOnce .}}
1717
- id: {{ b64enc "aws-eks-cluster::SkyWalking" }}.1_{{ b64enc "kube-dns" }}
1818
name: kube-dns
1919
{{- end}}

test/e2e-v2/cases/aws/eks/expected/instance.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515

16-
{{- contains . }}
16+
{{- containsOnce . }}
1717
- id: {{ notEmpty .id }}
1818
name: ip-172-31-10-158.ap-northeast-1.compute.internal
1919
instanceuuid: {{ notEmpty .instanceuuid }}

0 commit comments

Comments
 (0)