test: improve tests

test_cache_strategy was incorrectly reverting updates in test.

There is an issue in permissions tests. The issue will be resolved later. For now, it is only documented.

JIRA: TRIVIAL

Author: hkad98

gooddata-sdk/tests/catalog/fixtures/data_sources/demo_cache_strategy.yaml

@@ -80,92 +80,9 @@ interactions:
               url: jdbc:postgresql://localhost:5432/demo
               username: demouser
               enableCaching: false
-              type: POSTGRESQL
-              schema: demo
               name: demo-test-ds
-          links:
-            self: http://localhost:3000/api/v1/entities/dataSources/demo-test-ds
-  - request:
-      method: GET
-      uri: http://localhost:3000/api/v1/entities/dataSources/demo-test-ds
-      body: null
-      headers:
-        Accept:
-          - application/vnd.gooddata.api+json
-        Accept-Encoding:
-          - br, gzip, deflate
-        X-GDC-VALIDATE-RELATIONS:
-          - 'true'
-        X-Requested-With:
-          - XMLHttpRequest
-    response:
-      status:
-        code: 200
-        message: OK
-      headers:
-        Access-Control-Allow-Credentials:
-          - 'true'
-        Access-Control-Expose-Headers:
-          - Content-Disposition, Content-Length, Content-Range, Set-Cookie
-        Cache-Control:
-          - no-cache, no-store, max-age=0, must-revalidate
-        Connection:
-          - keep-alive
-        Content-Length:
-          - '295'
-        Content-Security-Policy:
-          - 'default-src ''self'' *.wistia.com *.wistia.net; script-src ''self'' ''unsafe-inline''
-            ''unsafe-eval'' *.wistia.com *.wistia.net *.hsforms.net *.hsforms.com
-            src.litix.io matomo.anywhere.gooddata.com *.jquery.com unpkg.com cdnjs.cloudflare.com;
-            img-src * data: blob:; style-src ''self'' ''unsafe-inline'' fonts.googleapis.com
-            cdn.jsdelivr.net fast.fonts.net; font-src ''self'' data: fonts.gstatic.com
-            *.alicdn.com *.wistia.com cdn.jsdelivr.net info.gooddata.com; frame-src
-            ''self'' *.hsforms.net *.hsforms.com; object-src ''none''; worker-src
-            ''self'' blob:; child-src blob:; connect-src ''self'' *.tiles.mapbox.com
-            *.mapbox.com *.litix.io *.wistia.com *.hsforms.net *.hsforms.com embedwistia-a.akamaihd.net
-            matomo.anywhere.gooddata.com; media-src ''self'' blob: data: *.wistia.com
-            *.wistia.net embedwistia-a.akamaihd.net'
-        Content-Type:
-          - application/vnd.gooddata.api+json
-        DATE: *id001
-        Expires:
-          - '0'
-        GoodData-Deployment:
-          - aio
-        Permission-Policy:
-          - geolocation 'none'; midi 'none'; sync-xhr 'none'; microphone 'none'; camera
-            'none'; magnetometer 'none'; gyroscope 'none'; fullscreen 'none'; payment
-            'none';
-        Pragma:
-          - no-cache
-        Referrer-Policy:
-          - no-referrer
-        Server:
-          - nginx
-        Set-Cookie:
-          - SPRING_REDIRECT_URI=; Path=/; Max-Age=0; Expires=Thu, 01 Jan 1970 00:00:00
-            GMT; HttpOnly; SameSite=Lax
-        Vary:
-          - Origin
-          - Access-Control-Request-Method
-          - Access-Control-Request-Headers
-        X-Content-Type-Options:
-          - nosniff
-        X-GDC-TRACE-ID: *id001
-        X-XSS-Protection:
-          - 1 ; mode=block
-      body:
-        string:
-          data:
-            id: demo-test-ds
-            type: dataSource
-            attributes:
-              url: jdbc:postgresql://localhost:5432/demo
-              username: demouser
-              enableCaching: false
               type: POSTGRESQL
               schema: demo
-              name: demo-test-ds
           links:
             self: http://localhost:3000/api/v1/entities/dataSources/demo-test-ds
   - request:
@@ -256,93 +173,9 @@ interactions:
               username: demouser
               enableCaching: false
               cacheStrategy: NEVER
-              type: POSTGRESQL
-              schema: demo
               name: demo-test-ds
-          links:
-            self: http://localhost:3000/api/v1/entities/dataSources/demo-test-ds
-  - request:
-      method: GET
-      uri: http://localhost:3000/api/v1/entities/dataSources/demo-test-ds
-      body: null
-      headers:
-        Accept:
-          - application/vnd.gooddata.api+json
-        Accept-Encoding:
-          - br, gzip, deflate
-        X-GDC-VALIDATE-RELATIONS:
-          - 'true'
-        X-Requested-With:
-          - XMLHttpRequest
-    response:
-      status:
-        code: 200
-        message: OK
-      headers:
-        Access-Control-Allow-Credentials:
-          - 'true'
-        Access-Control-Expose-Headers:
-          - Content-Disposition, Content-Length, Content-Range, Set-Cookie
-        Cache-Control:
-          - no-cache, no-store, max-age=0, must-revalidate
-        Connection:
-          - keep-alive
-        Content-Length:
-          - '319'
-        Content-Security-Policy:
-          - 'default-src ''self'' *.wistia.com *.wistia.net; script-src ''self'' ''unsafe-inline''
-            ''unsafe-eval'' *.wistia.com *.wistia.net *.hsforms.net *.hsforms.com
-            src.litix.io matomo.anywhere.gooddata.com *.jquery.com unpkg.com cdnjs.cloudflare.com;
-            img-src * data: blob:; style-src ''self'' ''unsafe-inline'' fonts.googleapis.com
-            cdn.jsdelivr.net fast.fonts.net; font-src ''self'' data: fonts.gstatic.com
-            *.alicdn.com *.wistia.com cdn.jsdelivr.net info.gooddata.com; frame-src
-            ''self'' *.hsforms.net *.hsforms.com; object-src ''none''; worker-src
-            ''self'' blob:; child-src blob:; connect-src ''self'' *.tiles.mapbox.com
-            *.mapbox.com *.litix.io *.wistia.com *.hsforms.net *.hsforms.com embedwistia-a.akamaihd.net
-            matomo.anywhere.gooddata.com; media-src ''self'' blob: data: *.wistia.com
-            *.wistia.net embedwistia-a.akamaihd.net'
-        Content-Type:
-          - application/vnd.gooddata.api+json
-        DATE: *id001
-        Expires:
-          - '0'
-        GoodData-Deployment:
-          - aio
-        Permission-Policy:
-          - geolocation 'none'; midi 'none'; sync-xhr 'none'; microphone 'none'; camera
-            'none'; magnetometer 'none'; gyroscope 'none'; fullscreen 'none'; payment
-            'none';
-        Pragma:
-          - no-cache
-        Referrer-Policy:
-          - no-referrer
-        Server:
-          - nginx
-        Set-Cookie:
-          - SPRING_REDIRECT_URI=; Path=/; Max-Age=0; Expires=Thu, 01 Jan 1970 00:00:00
-            GMT; HttpOnly; SameSite=Lax
-        Vary:
-          - Origin
-          - Access-Control-Request-Method
-          - Access-Control-Request-Headers
-        X-Content-Type-Options:
-          - nosniff
-        X-GDC-TRACE-ID: *id001
-        X-XSS-Protection:
-          - 1 ; mode=block
-      body:
-        string:
-          data:
-            id: demo-test-ds
-            type: dataSource
-            attributes:
-              url: jdbc:postgresql://localhost:5432/demo
-              username: demouser
-              enableCaching: false
-              cacheStrategy: NEVER
               type: POSTGRESQL
               schema: demo
-              name: demo-test-ds
           links:
             self: http://localhost:3000/api/v1/entities/dataSources/demo-test-ds
   - request:
@@ -424,39 +257,46 @@ interactions:
               username: demouser
               enableCaching: false
               cacheStrategy: NEVER
+              name: demo-test-ds
               type: POSTGRESQL
               schema: demo
-              name: demo-test-ds
           links:
             self: http://localhost:3000/api/v1/entities/dataSources/demo-test-ds
   - request:
       method: PUT
-      uri: http://localhost:3000/api/v1/entities/dataSources/demo-test-ds
+      uri: http://localhost:3000/api/v1/layout/dataSources
       body:
-        data:
-          attributes:
+        dataSources:
+          - id: demo-test-ds
             name: demo-test-ds
             schema: demo
             type: POSTGRESQL
             url: jdbc:postgresql://localhost:5432/demo
             enableCaching: false
-          id: demo-test-ds
-          type: dataSource
+            username: demouser
+            permissions:
+              - assignee:
+                  id: demo2
+                  type: user
+                name: MANAGE
+              - assignee:
+                  id: demoGroup
+                  type: userGroup
+                name: USE
+            password: demopass
       headers:
-        Accept:
-          - application/vnd.gooddata.api+json
         Accept-Encoding:
           - br, gzip, deflate
         Content-Type:
-          - application/vnd.gooddata.api+json
+          - application/json
         X-GDC-VALIDATE-RELATIONS:
           - 'true'
         X-Requested-With:
           - XMLHttpRequest
     response:
       status:
-        code: 200
-        message: OK
+        code: 204
+        message: No Content
       headers:
         Access-Control-Allow-Credentials:
           - 'true'
@@ -466,8 +306,6 @@ interactions:
           - no-cache, no-store, max-age=0, must-revalidate
         Connection:
           - keep-alive
-        Content-Length:
-          - '273'
         Content-Security-Policy:
           - 'default-src ''self'' *.wistia.com *.wistia.net; script-src ''self'' ''unsafe-inline''
             ''unsafe-eval'' *.wistia.com *.wistia.net *.hsforms.net *.hsforms.com
@@ -480,8 +318,6 @@ interactions:
             *.mapbox.com *.litix.io *.wistia.com *.hsforms.net *.hsforms.com embedwistia-a.akamaihd.net
             matomo.anywhere.gooddata.com; media-src ''self'' blob: data: *.wistia.com
             *.wistia.net embedwistia-a.akamaihd.net'
-        Content-Type:
-          - application/vnd.gooddata.api+json
         DATE: *id001
         Expires:
           - '0'
@@ -510,15 +346,4 @@ interactions:
         X-XSS-Protection:
           - 1 ; mode=block
       body:
-        string:
-          data:
-            id: demo-test-ds
-            type: dataSource
-            attributes:
-              url: jdbc:postgresql://localhost:5432/demo
-              enableCaching: false
-              type: POSTGRESQL
-              schema: demo
-              name: demo-test-ds
-          links:
-            self: http://localhost:3000/api/v1/entities/dataSources/demo-test-ds
+        string: ''

gooddata-sdk/tests/catalog/test_catalog_data_source.py

@@ -511,15 +511,16 @@ def test_declarative_data_sources(test_config):
 def test_cache_strategy(test_config: dict):
     sdk = GoodDataSdk.create(host_=test_config["host"], token_=test_config["token"])
     data_source_id = test_config["data_source"]
-
-    original = sdk.catalog_data_source.get_data_source(data_source_id=data_source_id)
+    path = _current_dir / "expected" / "declarative_data_sources.json"
+    credentials_path = _current_dir / "load" / "data_source_credentials" / "data_sources_credentials.yaml"
 
     try:
         sdk.catalog_data_source.patch_data_source_attributes(data_source_id, {"cache_strategy": "NEVER"})
         updated = sdk.catalog_data_source.get_data_source(data_source_id=data_source_id)
         assert updated.cache_strategy == "NEVER"
     finally:
-        sdk.catalog_data_source.create_or_update_data_source(original)
+        data_sources_o = CatalogDeclarativeDataSources.from_dict(load_json(path))
+        sdk.catalog_data_source.put_declarative_data_sources(data_sources_o, credentials_path)
 
 
 @gd_vcr.use_cassette(str(_fixtures_dir / "demo_test_scan_model.yaml"))

gooddata-sdk/tests/catalog/test_catalog_user_service.py

@@ -503,6 +503,9 @@ def test_user_replace_user_groups(test_config):
 
 @gd_vcr.use_cassette(str(_fixtures_dir / "test_get_user_permissions.yaml"))
 def test_get_user_permissions(test_config):
+    """
+    TODO: tests above corrupts result for permissions tests – the fix is required
+    """
     sdk = GoodDataSdk.create(host_=test_config["host"], token_=test_config["token"])
     user_id = test_config["test_user"]
     workspace_id = test_config["workspace"]