Revert "Refactor entities (#33)" (#35)

This reverts commit 7d9b658.
felipehernandez · Jul 19, 2020 · 9f65af6 · 9f65af6
1 parent 7d9b658
commit 9f65af6
Show file tree

Hide file tree

Showing 83 changed files with 914 additions and 1,704 deletions.
diff --git a/.drone.yaml b/.drone.yaml
@@ -15,17 +15,13 @@ steps:
       - mkdir /folker
       - mkdir /protos
       - mkdir /testcode
-      - mkdir /credentials
-      - cp -a ./folker.py             /
-      - cp -a ./folker/*              /folker
-      - cp -a ./example/protos/*      /protos
-      - cp -a ./example/code/*        /testcode
-      - cp -a ./example/credentials/* /credentials
+      - cp -a ./folker.py         /
+      - cp -a ./folker/*          /folker/
+      - cp -a ./example/protos/*  /protos/
+      - cp -a ./example/code/*    /testcode/
       - cd /
       - sleep 5 # time for mockserver to start
-      - python3 folker.py -p test-profile -n 24 --trace
-      - python3 folker.py -t dummy -t print -n 2 --trace
-      - python3 folker.py -t dummy -t print --trace
+      - python3 folker.py -p test-profile -n 19 --trace
 
   - name: bake-beta
     image: plugins/docker
@@ -37,7 +33,7 @@ steps:
       repo: folkertest/folkertest
       tags:
         - beta
-        - "0.3.${DRONE_BUILD_NUMBER}"
+        - "0.2.${DRONE_BUILD_NUMBER}"
     when:
       branch:
         - development
@@ -53,42 +49,30 @@ steps:
       repo: folkertest/folkertest
       tags:
         - latest
-        - "0.3.${DRONE_BUILD_NUMBER}"
+        - "0.2.${DRONE_BUILD_NUMBER}"
     when:
       branch:
         - master
         - release
       event: push
 
 services:
-    # http://mockserver:1080
   - name: mockserver
+    # http://mockserver:1080
     image: mockserver/mockserver:latest
-
-    # gcp-pubsub-emulator:8681
   - name: gcp-pubsub-emulator
+    # gcp-pubsub-emulator:8681
     image: messagebird/gcloud-pubsub-emulator:latest
     environment:
       PUBSUB_PROJECT1: "folker-test-gcp-test,a_topic:a_subscription"
-
-    # gcp-datastore-emulator:8684
-  - name: gcp-datastore-emulator
-    image: singularities/datastore-emulator
-    environment:
-      DATASTORE_PROJECT_ID: folker-test-gcp-test
-      DATASTORE_LISTEN_ADDRESS: 0.0.0.0:8684
-
-    # grpc-test-server:8682
   - name: grpc-test-server
+    # grpc-test-server:8682
     image: folkertest/grpc-test-server:latest
-
-    # graphql-test-server:8683
   - name: graphql-test-server
+    # grpc-test-server:8682
     image: folkertest/graphql-test-server:latest
-
-    # postgres-server:5432
   - name: postgres-server
-    image: postgres
     environment:
       POSTGRES_USER: postgres
-      POSTGRES_PASSWORD: docker
+      POSTGRES_PASSWORD: docker
+    image: postgres
diff --git a/doc/Documentation.md b/doc/Documentation.md
diff --git a/example/credentials/gcp/gcp-credentials.json b/example/credentials/gcp/gcp-credentials.json
diff --git a/example/test/complex/test_rest_proto.yaml → .../test/complex/folker_test_rest_proto.yaml b/example/test/complex/test_rest_proto.yaml → .../test/complex/folker_test_rest_proto.yaml
diff --git a/example/test/complex/test_complex_save.yaml → .../test/dummy/folker_test_complex_save.yaml b/example/test/complex/test_complex_save.yaml → .../test/dummy/folker_test_complex_save.yaml
diff --git a/example/test/dummy/test_dummy_code.yaml → ...le/test/dummy/folker_test_dummy_code.yaml b/example/test/dummy/test_dummy_code.yaml → ...le/test/dummy/folker_test_dummy_code.yaml
diff --git a/example/test/dummy/test_dummy_graphql.yaml → ...test/dummy/folker_test_dummy_graphql.yaml b/example/test/dummy/test_dummy_graphql.yaml → ...test/dummy/folker_test_dummy_graphql.yaml
diff --git a/example/test/dummy/test_dummy_grpc.yaml → ...le/test/dummy/folker_test_dummy_grpc.yaml b/example/test/dummy/test_dummy_grpc.yaml → ...le/test/dummy/folker_test_dummy_grpc.yaml
@@ -26,7 +26,7 @@ stages:
       package: protos.TestProto
       stub: TestServiceStub
       method: hello
-      data: ${request}
+      data: request
     save:
       response: ${response}
     log:
@@ -42,7 +42,7 @@ stages:
       package: protos.TestProto
       stub: TestServiceStub
       method: hellos
-      data: ${request}
+      data: request
     save:
       response: ${response}
     log:

diff --git a/example/test/dummy/test_dummy_postgres.yaml → ...est/dummy/folker_test_dummy_postgres.yaml b/example/test/dummy/test_dummy_postgres.yaml → ...est/dummy/folker_test_dummy_postgres.yaml
diff --git a/example/test/dummy/test_dummy_print.yaml → ...e/test/dummy/folker_test_dummy_print.yaml b/example/test/dummy/test_dummy_print.yaml → ...e/test/dummy/folker_test_dummy_print.yaml
diff --git a/example/test/dummy/test_dummy_protobuf.yaml → ...est/dummy/folker_test_dummy_protobuf.yaml b/example/test/dummy/test_dummy_protobuf.yaml → ...est/dummy/folker_test_dummy_protobuf.yaml
diff --git a/example/test/dummy/test_dummy_rest.yaml → ...le/test/dummy/folker_test_dummy_rest.yaml b/example/test/dummy/test_dummy_rest.yaml → ...le/test/dummy/folker_test_dummy_rest.yaml
diff --git a/example/test/dummy/test_dummy_void.yaml → ...le/test/dummy/folker_test_dummy_void.yaml b/example/test/dummy/test_dummy_void.yaml → ...le/test/dummy/folker_test_dummy_void.yaml
diff --git a/example/test/dummy/test_dummy_wait.yaml → ...le/test/dummy/folker_test_dummy_wait.yaml b/example/test/dummy/test_dummy_wait.yaml → ...le/test/dummy/folker_test_dummy_wait.yaml
diff --git a/example/test/dummy/test_foreach_stages.yaml → ...est/dummy/folker_test_foreach_stages.yaml b/example/test/dummy/test_foreach_stages.yaml → ...est/dummy/folker_test_foreach_stages.yaml
diff --git a/...ple/test/dummy/gcp/test_dummy_pubsub.yaml → ...t/dummy/gcp/folker_test_dummy_pubsub.yaml b/...ple/test/dummy/gcp/test_dummy_pubsub.yaml → ...t/dummy/gcp/folker_test_dummy_pubsub.yaml
@@ -5,42 +5,29 @@ tags:
   - pubsub
 
 stages:
-  - name: setup
-    action:
-      type: VOID
-    save:
-#      host: localhost:8681
-      host: gcp-pubsub-emulator:8681
-
   - name: check topic
     action:
       type: PUBSUB
       method: TOPICS
-      host: ${host}
+      host: gcp-pubsub-emulator:8681
       project: folker-test-gcp-test
     assert:
       - "'a_topic' in ${topics}"
-    log:
-      - 'Elapsed time: ${elapsed_time}'
-      - 'Topics: ${topics}'
 
   - name: check subscription
     action:
       type: PUBSUB
       method: SUBSCRIPTIONS
-      host: ${host}
+      host: gcp-pubsub-emulator:8681
       project: folker-test-gcp-test
     assert:
       - "'a_subscription' in ${subscriptions}"
-    log:
-      - 'Elapsed time: ${elapsed_time}'
-      - 'Subscriptions: ${subscriptions}'
 
   - name: publish
     action:
       type: PUBSUB
       method: PUBLISH
-      host: ${host}
+      host: gcp-pubsub-emulator:8681
       project: folker-test-gcp-test
       topic: a_topic
       message: hello world
@@ -52,7 +39,7 @@ stages:
     action:
       type: PUBSUB
       method: SUBSCRIBE
-      host: ${host}
+      host: gcp-pubsub-emulator:8681
       project: folker-test-gcp-test
       subscription: a_subscription
       ack: True