Fix issue with attributes.Init resets existing attributes

Experiment with protoregistry

Signed-off-by: Valery Piashchynski <[email protected]>

4 files changed, 47 insertions, 39 deletions

diff --git a/tests/env/docker-compose.yaml b/tests/env/docker-compose.yaml
index d93bc5af..8ef2a99b 100644
--- a/tests/env/docker-compose.yaml
+++ b/tests/env/docker-compose.yaml
@@ -1,44 +1,44 @@
-version: '3'
+version: "3"
 
 services:
-  memcached:
-    image: memcached:latest
-    ports:
-      - "127.0.0.1:11211:11211"
-  redis:
-    image: redis:6
-    ports:
-      - "127.0.0.1:6379:6379"
-  redis2:
-    image: redis:6
-    ports:
-      - "127.0.0.1:6378:6379"
+    memcached:
+        image: memcached:latest
+        ports:
+            - "127.0.0.1:11211:11211"
+    redis:
+        image: redis:6
+        ports:
+            - "127.0.0.1:6379:6379"
+    redis2:
+        image: redis:6
+        ports:
+            - "127.0.0.1:6378:6379"
 
-  toxicproxy:
-    image: shopify/toxiproxy
-    network_mode: "host"
+    toxicproxy:
+        image: ghcr.io/shopify/toxiproxy:latest
+        network_mode: host
 
-  beanstalk:
-    build:
-      context: .
-      dockerfile: Dockerfile-beanstalkd.yaml
-    ports:
-      - "127.0.0.1:11300:11300"
+    beanstalk:
+        build:
+            context: .
+            dockerfile: Dockerfile-beanstalkd.yaml
+        ports:
+            - "127.0.0.1:11300:11300"
 
-  sqs:
-    build:
-      context: .
-      dockerfile: Dockerfile-elastic-mq.yaml
-    ports:
-      - "127.0.0.1:9324:9324"
+    sqs:
+        build:
+            context: .
+            dockerfile: Dockerfile-elastic-mq.yaml
+        ports:
+            - "127.0.0.1:9324:9324"
 
-  rabbitmq:
-    image: rabbitmq:3-management
-    ports:
-      - "127.0.0.1:15672:15672"
-      - "127.0.0.1:5672:5672"
+    rabbitmq:
+        image: rabbitmq:3-management
+        ports:
+            - "127.0.0.1:15672:15672"
+            - "127.0.0.1:5672:5672"
 
-  prometheus:
-    image: prom/prometheus
-    ports:
-      - "9090:9090"
+    prometheus:
+        image: prom/prometheus
+        ports:
+            - "9090:9090"
\ No newline at end of file
diff --git a/tests/plugins/grpcplug b/tests/plugins/grpcplug
deleted file mode 100755
index 21785aeb..00000000
--- a/tests/plugins/grpcplug
+++ /dev/null
diff --git a/tests/plugins/grpcplugin b/tests/plugins/grpcplugin
deleted file mode 100755
index 21785aeb..00000000
--- a/tests/plugins/grpcplugin
+++ /dev/null
diff --git a/tests/plugins/jobs/jobs_with_toxics_test.go b/tests/plugins/jobs/jobs_with_toxics_test.go
index 80fed8eb..84fbec48 100644
--- a/tests/plugins/jobs/jobs_with_toxics_test.go
+++ b/tests/plugins/jobs/jobs_with_toxics_test.go
@@ -27,10 +27,18 @@ import (
 
 func TestDurabilityAMQP(t *testing.T) {
 	client := toxiproxy.NewClient("127.0.0.1:8474")
+	proxies, err := client.Proxies()
+	require.NoError(t, err)
+
+	for p := range proxies {
+		_ = proxies[p].Delete()
+	}
 
-	_, err := client.CreateProxy("redial", "127.0.0.1:23679", "127.0.0.1:5672")
+	proxy, err := client.CreateProxy("redial", "127.0.0.1:23679", "127.0.0.1:5672")
 	require.NoError(t, err)
-	defer deleteProxy("redial", t)
+	defer func() {
+		_ = proxy.Delete()
+	}()
 
 	cont, err := endure.NewContainer(nil, endure.SetLogLevel(endure.ErrorLevel))
 	require.NoError(t, err)