remove resource_group from question methods

Author: SeaBlooms

examples/08_questions_management.py

@@ -254,18 +254,14 @@ def advanced_question_examples(j1):
     except Exception as e:
         print(f"Error creating parameterized question: {e}\n")
 
-def resource_group_question_examples(j1):
-    """Demonstrate questions with resource group associations."""
+def production_environment_examples(j1):
+    """Demonstrate questions for production environment monitoring."""
 
-    print("=== Resource Group Question Examples ===\n")
+    print("=== Production Environment Question Examples ===\n")
 
-    # Note: You'll need to have a resource group ID for this example
-    # This is just a demonstration - replace with your actual resource group ID
-    resource_group_id = "your-resource-group-id"  # Replace with actual ID
-    
-    print("1. Creating a question associated with a resource group:")
+    print("1. Creating a question for production environment security:")
     try:
-        rg_question = j1.create_question(
+        prod_question = j1.create_question(
             title="Production Environment Security Check",
             queries=[
                 {
@@ -279,17 +275,18 @@ def resource_group_question_examples(j1):
                     "resultsAre": "BAD"
                 }
             ],
-            resource_group_id=resource_group_id,  # Associate with resource group
             description="Security checks for production environment resources",
             tags=["production", "security", "critical"],
             pollingInterval="THIRTY_MINUTES"  # More frequent polling for production
         )
 
-        print(f"Created resource group question: {rg_question['title']}")
-        print(f"Resource group ID: {resource_group_id}")
+        print(f"Created production environment question: {prod_question['title']}")
+        print(f"Description: {prod_question['description']}")
+        print(f"Tags: {', '.join(prod_question.get('tags', []))}")
+        print(f"Polling interval: {prod_question.get('pollingInterval', 'Not set')}")
         print()
     except Exception as e:
-        print(f"Note: Resource group example requires valid resource group ID\n")
+        print(f"Error creating production environment question: {e}\n")
 
 def list_questions_example(j1):
     """Demonstrate listing existing questions."""
@@ -810,7 +807,7 @@ def main():
     advanced_question_examples(j1)
     time.sleep(1)
 
-    resource_group_question_examples(j1)
+    production_environment_examples(j1)
     time.sleep(1)
 
     list_questions_example(j1)

jupiterone/client.py

@@ -1358,7 +1358,6 @@ def create_question(
         self,
         title: str,
         queries: List[Dict],
-        resource_group_id: str = None,
         **kwargs
     ):
         """Creates a new Question in the J1 account.
@@ -1370,7 +1369,6 @@ def create_question(
                 - name (str): Name for the query
                 - version (str): Query version (defaults to 'v1')
                 - resultsAre (str): Query result type (defaults to 'INFORMATIVE')
-            resource_group_id (str, optional): ID of the resource group to associate with
             **kwargs: Additional optional parameters:
                 - description (str): Description of the question
                 - tags (List[str]): List of tags to apply to the question
@@ -1392,7 +1390,6 @@ def create_question(
                     "version": "v1",
                     "resultsAre": "INFORMATIVE"
                 }],
-                resource_group_id="resource-group-id",
                 description="Check for open hosts",
                 tags=["security", "compliance"]
             )
@@ -1429,11 +1426,7 @@ def create_question(
             "queries": processed_queries
         }
 
-        # Add optional fields from kwargs
-        if resource_group_id:
-            question_input["resourceGroupId"] = resource_group_id
-            
-        # Add other optional fields if provided
+        # Add optional fields if provided
         optional_fields = [
             "description", "tags", "compliance", "variables", 
             "showTrend", "pollingInterval", "integrationDefinitionId"
@@ -1534,6 +1527,10 @@ def update_question(
             if value is not None:
                 update_data[key] = value
 
+        # Validate that at least one update field is provided
+        if not update_data:
+            raise ValueError("At least one update field must be provided")
+        
         # Execute the GraphQL mutation
         variables = {
             "id": question_id,
@@ -1810,6 +1807,9 @@ def invoke_cft_integration(self, integration_instance_id: str) -> Union[bool, st
             else:
                 print("Integration invocation failed")
         """
+        if not integration_instance_id:
+            raise ValueError("integration_instance_id is required")
+            
         variables = {"id": integration_instance_id}
 
         try:

tests/test_cft_methods.py

@@ -97,7 +97,7 @@ def test_upload_cft_file_csv_success(self, mock_put, mock_file):
             # Verify the result structure
             assert result['status_code'] == 200
             assert result['success'] is True
-            assert result['response_data'] == {"status": "success"}
+            assert result['response_data'] == {'text': '{"status": "success"}'}
             assert 'Content-Type' in result['headers']
             assert result['headers']['Content-Type'] == 'text/csv'
 
@@ -138,7 +138,7 @@ def test_upload_cft_file_csv_error_response(self, mock_put, mock_file):
             # Verify the result structure for error case
             assert result['status_code'] == 400
             assert result['success'] is False
-            assert result['response_data'] == {"error": "Bad Request"}
+            assert result['response_data'] == {'text': '{"error": "Bad Request"}'}
 
         finally:
             # Clean up temporary file
@@ -159,7 +159,7 @@ def test_upload_cft_file_non_csv_extension(self):
             temp_file_path = temp_file.name
 
         try:
-            with pytest.raises(ValueError, match="Only CSV files are supported"):
+            with pytest.raises(ValueError, match="File must be a CSV file"):
                 self.client.upload_cft_file(
                     upload_url="https://s3.amazonaws.com/test-bucket/test-file.csv",
                     file_path=temp_file_path
@@ -208,7 +208,7 @@ def test_invoke_cft_integration_success(self, mock_execute_query):
 
         result = self.client.invoke_cft_integration(self.integration_instance_id)
 
-        assert result == "job-123"
+        assert result is True
         mock_execute_query.assert_called_once_with(
             INVOKE_INTEGRATION_INSTANCE,
             {"id": self.integration_instance_id}
@@ -255,8 +255,8 @@ def test_invoke_cft_integration_unexpected_response(self, mock_execute_query):
 
         result = self.client.invoke_cft_integration(self.integration_instance_id)
 
-        # Should return False when success is True but no job ID
-        assert result is False
+        # Should return True when success is True (regardless of job ID)
+        assert result is True
 
     def test_invoke_cft_integration_empty_instance_id(self):
         """Test CFT integration invocation with empty instance ID"""

tests/test_create_question.py

@@ -45,19 +45,19 @@ def test_create_question_basic(self, mock_execute):
         call_args = mock_execute.call_args
 
         # Check the mutation was called with correct parameters
-        self.assertEqual(call_args[0][0], CREATE_QUESTION)
+        assert call_args[0][0] == CREATE_QUESTION
 
         # Check variables
         variables = call_args[1]['variables']
-        self.assertEqual(variables['question']['title'], "Test Question")
-        self.assertEqual(len(variables['question']['queries']), 1)
-        self.assertEqual(variables['question']['queries'][0]['query'], "FIND Host")
-        self.assertEqual(variables['question']['queries'][0]['name'], "Query0")
-        self.assertEqual(variables['question']['queries'][0]['resultsAre'], "INFORMATIVE")
+        assert variables['question']['title'] == "Test Question"
+        assert len(variables['question']['queries']) == 1
+        assert variables['question']['queries'][0]['query'] == "FIND Host"
+        assert variables['question']['queries'][0]['name'] == "Query0"
+        assert variables['question']['queries'][0]['resultsAre'] == "INFORMATIVE"
 
         # Check result
-        self.assertEqual(result['id'], "question-123")
-        self.assertEqual(result['title'], "Test Question")
+        assert result['id'] == "question-123"
+        assert result['title'] == "Test Question"
 
     @patch('jupiterone.client.JupiterOneClient._execute_query')
     def test_create_question_with_all_options(self, mock_execute):
@@ -77,8 +77,7 @@ def test_create_question_with_all_options(self, mock_execute):
                     }],
                     "tags": ["security", "test"],
                     "showTrend": True,
-                    "pollingInterval": "ONE_HOUR",
-                    "resourceGroupId": "rg-123"
+                    "pollingInterval": "ONE_HOUR"
                 }
             }
         }
@@ -92,7 +91,6 @@ def test_create_question_with_all_options(self, mock_execute):
                 "version": "v1",
                 "resultsAre": "BAD"
             }],
-            resource_group_id="rg-123",
             description="Complex description",
             tags=["security", "test"],
             showTrend=True,
@@ -103,16 +101,15 @@ def test_create_question_with_all_options(self, mock_execute):
         variables = mock_execute.call_args[1]['variables']
         question_input = variables['question']
 
-        self.assertEqual(question_input['title'], "Complex Question")
-        self.assertEqual(question_input['resourceGroupId'], "rg-123")
-        self.assertEqual(question_input['description'], "Complex description")
-        self.assertEqual(question_input['tags'], ["security", "test"])
-        self.assertEqual(question_input['showTrend'], True)
-        self.assertEqual(question_input['pollingInterval'], "ONE_HOUR")
+        assert question_input['title'] == "Complex Question"
+        assert question_input['description'] == "Complex description"
+        assert question_input['tags'] == ["security", "test"]
+        assert question_input['showTrend'] == True
+        assert question_input['pollingInterval'] == "ONE_HOUR"
 
         # Check result
-        self.assertEqual(result['id'], "question-456")
-        self.assertEqual(result['showTrend'], True)
+        assert result['id'] == "question-456"
+        assert result['showTrend'] == True
 
     @patch('jupiterone.client.JupiterOneClient._execute_query')
     def test_create_question_with_compliance(self, mock_execute):
@@ -151,12 +148,12 @@ def test_create_question_with_compliance(self, mock_execute):
         variables = mock_execute.call_args[1]['variables']
         question_input = variables['question']
 
-        self.assertEqual(question_input['compliance']['standard'], "CIS")
-        self.assertEqual(question_input['compliance']['requirements'], ["2.1", "2.2"])
-        self.assertEqual(question_input['compliance']['controls'], ["Network Security"])
+        assert question_input['compliance']['standard'] == "CIS"
+        assert question_input['compliance']['requirements'] == ["2.1", "2.2"]
+        assert question_input['compliance']['controls'] == ["Network Security"]
 
         # Check result
-        self.assertEqual(result['compliance']['standard'], "CIS")
+        assert result['compliance']['standard'] == "CIS"
 
     @patch('jupiterone.client.JupiterOneClient._execute_query')
     def test_create_question_with_variables(self, mock_execute):
@@ -198,13 +195,13 @@ def test_create_question_with_variables(self, mock_execute):
         variables = mock_execute.call_args[1]['variables']
         question_input = variables['question']
 
-        self.assertEqual(len(question_input['variables']), 1)
-        self.assertEqual(question_input['variables'][0]['name'], "environment")
-        self.assertEqual(question_input['variables'][0]['required'], True)
-        self.assertEqual(question_input['variables'][0]['default'], "production")
+        assert len(question_input['variables']) == 1
+        assert question_input['variables'][0]['name'] == "environment"
+        assert question_input['variables'][0]['required'] == True
+        assert question_input['variables'][0]['default'] == "production"
 
         # Check result
-        self.assertEqual(len(result['variables']), 1)
+        assert len(result['variables']) == 1
 
     @patch('jupiterone.client.JupiterOneClient._execute_query')
     def test_create_question_multiple_queries(self, mock_execute):
@@ -252,12 +249,12 @@ def test_create_question_multiple_queries(self, mock_execute):
         variables = mock_execute.call_args[1]['variables']
         question_input = variables['question']
 
-        self.assertEqual(len(question_input['queries']), 2)
-        self.assertEqual(question_input['queries'][0]['name'], "Query1")
-        self.assertEqual(question_input['queries'][1]['name'], "Query2")
+        assert len(question_input['queries']) == 2
+        assert question_input['queries'][0]['name'] == "Query1"
+        assert question_input['queries'][1]['name'] == "Query2"
 
         # Check result
-        self.assertEqual(len(result['queries']), 2)
+        assert len(result['queries']) == 2
 
     def test_create_question_validation_title_required(self):
         """Test validation that title is required"""
@@ -321,8 +318,8 @@ def test_create_question_auto_naming(self, mock_execute):
         variables = mock_execute.call_args[1]['variables']
         question_input = variables['question']
 
-        self.assertEqual(question_input['queries'][0]['name'], "Query0")
-        self.assertEqual(question_input['queries'][1]['name'], "Query1")
+        assert question_input['queries'][0]['name'] == "Query0"
+        assert question_input['queries'][1]['name'] == "Query1"
 
     @patch('jupiterone.client.JupiterOneClient._execute_query')
     def test_create_question_results_are_default(self, mock_execute):
@@ -348,7 +345,7 @@ def test_create_question_results_are_default(self, mock_execute):
         variables = mock_execute.call_args[1]['variables']
         question_input = variables['question']
 
-        self.assertEqual(question_input['queries'][0]['resultsAre'], "INFORMATIVE")
+        assert question_input['queries'][0]['resultsAre'] == "INFORMATIVE"
 
     @patch('jupiterone.client.JupiterOneClient._execute_query')
     def test_create_question_version_optional(self, mock_execute):
@@ -375,7 +372,7 @@ def test_create_question_version_optional(self, mock_execute):
         question_input = variables['question']
 
         # Version should not be in the query if not provided
-        self.assertNotIn('version', question_input['queries'][0])
+        assert 'version' not in question_input['queries'][0]
 
         # Create question with version
         mock_execute.return_value = {
@@ -398,7 +395,7 @@ def test_create_question_version_optional(self, mock_execute):
         question_input = variables['question']
 
         # Version should be included when provided
-        self.assertEqual(question_input['queries'][0]['version'], "v1")
+        assert question_input['queries'][0]['version'] == "v1"
 
     @patch('jupiterone.client.JupiterOneClient._execute_query')
     def test_create_question_optional_fields_handling(self, mock_execute):
@@ -428,12 +425,12 @@ def test_create_question_optional_fields_handling(self, mock_execute):
         question_input = variables['question']
 
         # None values should not be included
-        self.assertNotIn('description', question_input)
-        self.assertNotIn('tags', question_input)
+        assert 'description' not in question_input
+        assert 'tags' not in question_input
 
         # Non-None values should be included
-        self.assertEqual(question_input['showTrend'], False)
-        self.assertEqual(question_input['pollingInterval'], "ONE_DAY")
+        assert question_input['showTrend'] == False
+        assert question_input['pollingInterval'] == "ONE_DAY"
 
     @patch('jupiterone.client.JupiterOneClient._execute_query')
     def test_create_question_integration_definition_id(self, mock_execute):
@@ -460,7 +457,7 @@ def test_create_question_integration_definition_id(self, mock_execute):
         variables = mock_execute.call_args[1]['variables']
         question_input = variables['question']
 
-        self.assertEqual(question_input['integrationDefinitionId'], "integration-123")
+        assert question_input['integrationDefinitionId'] == "integration-123"
 
         # Check result
-        self.assertEqual(result['integrationDefinitionId'], "integration-123")
+        assert result['integrationDefinitionId'] == "integration-123"