qontract-reconcile 0.10.2.dev25__py3-none-any.whl → 0.10.2.dev27__py3-none-any.whl

{qontract_reconcile-0.10.2.dev25.dist-info → qontract_reconcile-0.10.2.dev27.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev25
+Version: 0.10.2.dev27
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Project-URL: homepage, https://github.com/app-sre/qontract-reconcile
 Project-URL: repository, https://github.com/app-sre/qontract-reconcile

{qontract_reconcile-0.10.2.dev25.dist-info → qontract_reconcile-0.10.2.dev27.dist-info}/RECORD

@@ -10,7 +10,7 @@ reconcile/aws_iam_password_reset.py,sha256=q96mwr2KeEQ5bpNniGlgIMZTxiuLSodcYfX-t
 reconcile/aws_support_cases_sos.py,sha256=hl_9L53yQYRQxKs3IWrd69Cc60XK067g_bJRM9B0udo,2975
 reconcile/blackbox_exporter_endpoint_monitoring.py,sha256=O1wFp52EyF538c6txaWBs8eMtUIy19gyHZ6VzJ6QXS8,3512
 reconcile/checkpoint.py,sha256=_JhMxrye5BgkRMxWYuf7Upli6XayPINKSsuo3ynHTRc,5010
-reconcile/cli.py,sha256=jI3MMGWLBXYl-0aYOA4hLEQlBdP9lbb1FyGnqEjt-mM,107621
+reconcile/cli.py,sha256=BCfKBc5BRq-9Y5WYe8sUoz9ufOsB1WwMvylx6mBf6CQ,107806
 reconcile/closedbox_endpoint_monitoring_base.py,sha256=MvGKBqH9PdHWdMjhLuptze-dk0Tifhp3-0SZdI-7Fmo,4862
 reconcile/cluster_deployment_mapper.py,sha256=5gumAaRCcFXsabUJ1dnuUy9WrP_FEEM5JnOnE8ch9sE,2326
 reconcile/dashdotdb_base.py,sha256=83ZWIf5JJk3P_D69y2TmXRcQr6ELJGlv10OM0h7fJVs,4767
@@ -37,7 +37,7 @@ reconcile/gitlab_mr_sqs_consumer.py,sha256=O46mdziPgGOndbU-0_UJKJVUaiEoVzJPEgKm4
 reconcile/gitlab_owners.py,sha256=Y3i-WqXhszLGqGmddt-tJ3OM2b_cViqDs1Ru1P1aQEM,13405
 reconcile/gitlab_permissions.py,sha256=gSGH6gAdJbPy5Z0rQGUqiNQSHty_tXQ_3Y4OQP_8nFs,8067
 reconcile/gitlab_projects.py,sha256=K3tFf_aD1W4Ijp5q-9Qek3kwFGEWPcZ1kd7tzFJ4GyQ,1781
-reconcile/integrations_manager.py,sha256=wZ5snv0l2KJ2EF7dAece8cDIvRYyGRXcdDcRfBNNfxQ,9573
+reconcile/integrations_manager.py,sha256=CY7cOj5dzt2se4IOg11VQvGQ-eTvLML5Q42Z9SSgeSk,9463
 reconcile/jenkins_base.py,sha256=0Gocu3fU2YTltaxBlbDQOUvP-7CP2OSQV1ZRwtWeVXw,875
 reconcile/jenkins_job_builder.py,sha256=2aeOSS5pwKJgF4EzoHBWlOYNbzLj3qYzv6u55Qg6MAg,3466
 reconcile/jenkins_job_builds_cleaner.py,sha256=0iiX0iJiIIter0g9l0l-C6TUvUdVy8O9zFUh7kaYw5w,3865
@@ -46,7 +46,7 @@ reconcile/jenkins_roles.py,sha256=HadmoNhgOoKMFZJmCe_Gdg0_a9k_1MuOXidtr801nUU,45
 reconcile/jenkins_webhooks.py,sha256=dzMT1ywXjeAo5sHj-ittW06Ed3beAUPjnc_oCAtD-Rg,2150
 reconcile/jenkins_webhooks_cleaner.py,sha256=JsN_NVPfZJwv1JtSzZXDIHUqGiefL-DRffFnDGau9aY,1539
 reconcile/jenkins_worker_fleets.py,sha256=L2wEXpd4xuEHrXGss4iH788nG8UlLSYduZe1EY2IVw4,5377
-reconcile/jira_permissions_validator.py,sha256=Hp9wkBUXafSIGtXozVhYRiIh3lxXyObCnmB77mGA9ZQ,13419
+reconcile/jira_permissions_validator.py,sha256=uuwzizb16jTWGctDB0cG0t9l3trDxZuK2SJA-9w7tfA,14872
 reconcile/jira_watcher.py,sha256=L_UL2MKm2SoIGNsCLThm28pnqCkoFc154JWsD6bURug,3593
 reconcile/ldap_users.py,sha256=7hdO5CAPl-VNBvDRmKHg13LoblHXXPt7YEKNGomAoGg,3158
 reconcile/mr_client_gateway.py,sha256=WhjMd-sIXDFCV8-rt8CEjurJ5OYB1pOD0K3o0tZRXQg,1885
@@ -215,7 +215,7 @@ reconcile/glitchtip_project_alerts/integration.py,sha256=BgMx-NyV9mTuv7Sotb2OioC
 reconcile/glitchtip_project_dsn/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/glitchtip_project_dsn/integration.py,sha256=2iugub-kHYkHNK33n0v9_TeWonuxCPah_VkoTPvaajE,8077
 reconcile/gql_definitions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/gql_definitions/introspection.json,sha256=_MsmBFKNpf6uIymRHvkzVyz5ICgVD0aAcDi_7czXfxQ,2221786
+reconcile/gql_definitions/introspection.json,sha256=GoGW7nosXPWvZYQsq6m8nYVIJHIO5hBh9upeFhS_M_k,2216702
 reconcile/gql_definitions/acs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/acs/acs_instances.py,sha256=L91WW9LbhJbBSrECqShQpFtjoBOsmNIYLRpMbx1io5o,2181
 reconcile/gql_definitions/acs/acs_policies.py,sha256=bN5i4mks10Z23KJSj7jqp966Osq2dps4d-sPH9gjxEA,7008
@@ -335,7 +335,7 @@ reconcile/gql_definitions/glitchtip/glitchtip_project.py,sha256=AojrkCDGbVjY0TOk
 reconcile/gql_definitions/glitchtip_project_alerts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/glitchtip_project_alerts/glitchtip_project.py,sha256=Pv6RcuIzpNmGc43eEq64nnKG0Dr7H0wjy5Xg1_oRltM,5197
 reconcile/gql_definitions/integrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/gql_definitions/integrations/integrations.py,sha256=yPpLVR_tML0QvjvLzGT7_D3SkpA6MaZqn0-45pukWgc,12821
+reconcile/gql_definitions/integrations/integrations.py,sha256=HosEgRUlAkxLNoj2cnq3mrTdWDn9UvbNmtz6OcweIYk,11668
 reconcile/gql_definitions/jenkins_configs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/jenkins_configs/jenkins_configs.py,sha256=kr1RwKcSpmpBkotl8rR0cOZ02Co5FAbE1he80CCFbTc,2961
 reconcile/gql_definitions/jenkins_configs/jenkins_instances.py,sha256=b3gYVzQavxeLe4jSM5ZxrO77Vvs7kOljVOXEkTO943U,2165
@@ -373,7 +373,6 @@ reconcile/gql_definitions/service_dependencies/jenkins_instance_fragment.py,sha2
 reconcile/gql_definitions/service_dependencies/service_dependencies.py,sha256=CpMq9KjhFA61yniLo_11ypVInoeMBXbNmcY7_VAep-0,4700
 reconcile/gql_definitions/sharding/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/sharding/aws_accounts.py,sha256=CtvVUKlS6PfsbInXuhlNwoV4Zmo4uiOc0mwubED8JwQ,1968
-reconcile/gql_definitions/sharding/jira_boards.py,sha256=yZGLQEQef919UPpy7PWlfusegYv91pByH5jsumXsYuc,1685
 reconcile/gql_definitions/sharding/ocm_organization.py,sha256=duBIg3531yJ7fWniuHOG6mASgIiKfFIg6mef_lDzwnE,1871
 reconcile/gql_definitions/skupper_network/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/skupper_network/site_controller_template.py,sha256=MFJTZAO0wRFlRBU4qfXUeQmCKIP4zkmnnCnrvX67FNY,756
@@ -581,7 +580,7 @@ reconcile/utils/external_resource_spec.py,sha256=bhH_xneFwATdFumTPkiQmcVKYI0gcaW
 reconcile/utils/external_resources.py,sha256=YzTb0xAcNdmKO326mGQy7BmST56CZcdru4lX7ai_7kw,7579
 reconcile/utils/filtering.py,sha256=S4PbMHuFr3ED0P2Q_ea5CAaB7FimI62B-F5YTaKrphA,402
 reconcile/utils/git.py,sha256=wzVIYAeKlMGW538U1mkJWUI6h_mFRUY4lawh2AR8hw4,2345
-reconcile/utils/github_api.py,sha256=oMInVIga9OITL7l5EWzs4lGXK0xAYhUznhjgXKjmmA0,2492
+reconcile/utils/github_api.py,sha256=y3fxty7FKvfhdzfHgGSaIstL6A_Y2loUcMiyIK5TMDg,2750
 reconcile/utils/gitlab_api.py,sha256=SR0graae7UBZyLLKA7yGsOqKm7dXFe5cexcaa1SokQo,28486
 reconcile/utils/gpg.py,sha256=EKG7_fdMv8BMlV5yUdPiqoTx-KrzmVSEAl2sLkaKwWI,1123
 reconcile/utils/gql.py,sha256=C0thIm_k9MBldfqwHzyqtYZk9sIvMdm9IbbnXLGwjD8,14158
@@ -719,7 +718,7 @@ reconcile/utils/runtime/environment.py,sha256=h-CFKLK1qRl_gfOVIUwjqVNOmukIPzUG7A
 reconcile/utils/runtime/integration.py,sha256=H3kDfbc4IKrhubSDCWHs0W9oxM7FoCiPaxqA73c9aEs,11101
 reconcile/utils/runtime/meta.py,sha256=dWdKS9eHVuowFkTK4lgXJ723vS1y9giOMzePUKnHnDI,214
 reconcile/utils/runtime/runner.py,sha256=I30KRrX1UQbHc_Ir1cIZX3OfNSdoHKdnDSPAEB69Ilk,7944
-reconcile/utils/runtime/sharding.py,sha256=y7UZrikyCe-0LmQOCL32fvjqX4NrdZ5rUH9lpvKH5Ks,18517
+reconcile/utils/runtime/sharding.py,sha256=r0ieUtNed7NvknSw6qQrCkKpVXE1shuHGnfFcnpA_k4,16142
 reconcile/utils/saasherder/__init__.py,sha256=3U8plqMAPRE1kjwZ5YnIsYsggTf4_gS7flRUEuXVBAs,343
 reconcile/utils/saasherder/interfaces.py,sha256=C2wrw34OXypshVocAsPrVZsSHptgw4g9u7Haa2wulZQ,9087
 reconcile/utils/saasherder/models.py,sha256=z8ln03zi2a8cu716NcNUDHp8Dv1VcVbhqdWVxCl7x9A,10148
@@ -767,7 +766,7 @@ tools/saas_promotion_state/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 tools/saas_promotion_state/saas_promotion_state.py,sha256=UfwwRLS5Ya4_Nh1w5n1dvoYtchQvYE9yj1VANt2IKqI,3925
 tools/sre_checkpoints/__init__.py,sha256=CDaDaywJnmRCLyl_NCcvxi-Zc0hTi_3OdwKiFOyS39I,145
 tools/sre_checkpoints/util.py,sha256=zEDbGr18ZeHNQwW8pUsr2JRjuXIPz--WAGJxZo9sv_Y,894
-qontract_reconcile-0.10.2.dev25.dist-info/METADATA,sha256=Iia7V8zNvzM3nF9KHAKkV8RG1MCrFVnDLiPHqq2Vfxw,24665
-qontract_reconcile-0.10.2.dev25.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev25.dist-info/entry_points.txt,sha256=JniHZPadNOILPyfSl0LF2YSp3Db7K2_W2CN7i9f3Gos,540
-qontract_reconcile-0.10.2.dev25.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev27.dist-info/METADATA,sha256=Nr3x_-2IN6jO8C6UVvoDJmObBt8_Y6OZ54Ok0UsHikA,24665
+qontract_reconcile-0.10.2.dev27.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev27.dist-info/entry_points.txt,sha256=JniHZPadNOILPyfSl0LF2YSp3Db7K2_W2CN7i9f3Gos,540
+qontract_reconcile-0.10.2.dev27.dist-info/RECORD,,

reconcile/cli.py

@@ -1158,7 +1158,10 @@ def jenkins_webhooks_cleaner(ctx):
 
 
 @integration.command(short_help="Validate permissions in Jira.")
-@click.option("--jira-board-name", help="The Jira board to act on.", default=None)
+@click.option(
+    "--jira-board-name", help="The Jira board to act on.", default=None, multiple=True
+)
+@click.option("--board-check-interval", help="Check interval in minutes", default=120)
 @enable_extended_early_exit
 @extended_early_exit_cache_ttl_seconds
 @log_cached_log_output
@@ -1166,6 +1169,7 @@ def jenkins_webhooks_cleaner(ctx):
 def jira_permissions_validator(
     ctx,
     jira_board_name,
+    board_check_interval,
     enable_extended_early_exit,
     extended_early_exit_cache_ttl_seconds,
     log_cached_log_output,
@@ -1176,6 +1180,7 @@ def jira_permissions_validator(
         reconcile.jira_permissions_validator,
         ctx.obj,
         jira_board_name=jira_board_name,
+        board_check_interval=board_check_interval,
         enable_extended_early_exit=enable_extended_early_exit,
         extended_early_exit_cache_ttl_seconds=extended_early_exit_cache_ttl_seconds,
         log_cached_log_output=log_cached_log_output,

reconcile/gql_definitions/integrations/integrations.py

@@ -191,22 +191,6 @@ query Integrations {
             }
           }
         }
-
-        ... on JiraBoardSharding_v1 {
-            shardSpecOverrides {
-              shard {
-                name
-                disable {
-                  integrations
-                }
-              }
-              imageRef
-              disabled
-              resources {
-                ... DeployResourcesFields
-              }
-            }
-        }
       }
     }
   }
@@ -358,30 +342,10 @@ class CloudflareDNSZoneShardingV1(IntegrationShardingV1):
     shard_spec_overrides: Optional[list[CloudflareDNSZoneShardSpecOverrideV1]] = Field(..., alias="shardSpecOverrides")
 
 
-class DisableJiraBoardAutomationsV1(ConfiguredBaseModel):
-    integrations: Optional[list[str]] = Field(..., alias="integrations")
-
-
-class JiraBoardV1(ConfiguredBaseModel):
-    name: str = Field(..., alias="name")
-    disable: Optional[DisableJiraBoardAutomationsV1] = Field(..., alias="disable")
-
-
-class JiraBoardShardSpecOverrideV1(ConfiguredBaseModel):
-    shard: JiraBoardV1 = Field(..., alias="shard")
-    image_ref: Optional[str] = Field(..., alias="imageRef")
-    disabled: Optional[bool] = Field(..., alias="disabled")
-    resources: Optional[DeployResourcesFields] = Field(..., alias="resources")
-
-
-class JiraBoardShardingV1(IntegrationShardingV1):
-    shard_spec_overrides: Optional[list[JiraBoardShardSpecOverrideV1]] = Field(..., alias="shardSpecOverrides")
-
-
 class IntegrationManagedV1(ConfiguredBaseModel):
     namespace: NamespaceV1 = Field(..., alias="namespace")
     spec: IntegrationSpecV1 = Field(..., alias="spec")
-    sharding: Optional[Union[StaticShardingV1, OpenshiftClusterShardingV1, OCMOrganizationShardingV1, AWSAccountShardingV1, CloudflareDNSZoneShardingV1, JiraBoardShardingV1, IntegrationShardingV1]] = Field(..., alias="sharding")
+    sharding: Optional[Union[StaticShardingV1, OpenshiftClusterShardingV1, OCMOrganizationShardingV1, AWSAccountShardingV1, CloudflareDNSZoneShardingV1, IntegrationShardingV1]] = Field(..., alias="sharding")
 
 
 class IntegrationV1(ConfiguredBaseModel):

reconcile/gql_definitions/introspection.json

@@ -29766,11 +29766,6 @@
                             "kind": "OBJECT",
                             "name": "AWSAccountSharding_v1",
                             "ofType": null
-                        },
-                        {
-                            "kind": "OBJECT",
-                            "name": "JiraBoardSharding_v1",
-                            "ofType": null
                         }
                     ]
                 },
@@ -49774,122 +49769,6 @@
                     "enumValues": null,
                     "possibleTypes": null
                 },
-                {
-                    "kind": "OBJECT",
-                    "name": "JiraBoardSharding_v1",
-                    "description": null,
-                    "fields": [
-                        {
-                            "name": "strategy",
-                            "description": null,
-                            "args": [],
-                            "type": {
-                                "kind": "NON_NULL",
-                                "name": null,
-                                "ofType": {
-                                    "kind": "SCALAR",
-                                    "name": "String",
-                                    "ofType": null
-                                }
-                            },
-                            "isDeprecated": false,
-                            "deprecationReason": null
-                        },
-                        {
-                            "name": "shardSpecOverrides",
-                            "description": null,
-                            "args": [],
-                            "type": {
-                                "kind": "LIST",
-                                "name": null,
-                                "ofType": {
-                                    "kind": "NON_NULL",
-                                    "name": null,
-                                    "ofType": {
-                                        "kind": "OBJECT",
-                                        "name": "JiraBoardShardSpecOverride_v1",
-                                        "ofType": null
-                                    }
-                                }
-                            },
-                            "isDeprecated": false,
-                            "deprecationReason": null
-                        }
-                    ],
-                    "inputFields": null,
-                    "interfaces": [
-                        {
-                            "kind": "INTERFACE",
-                            "name": "IntegrationSharding_v1",
-                            "ofType": null
-                        }
-                    ],
-                    "enumValues": null,
-                    "possibleTypes": null
-                },
-                {
-                    "kind": "OBJECT",
-                    "name": "JiraBoardShardSpecOverride_v1",
-                    "description": null,
-                    "fields": [
-                        {
-                            "name": "shard",
-                            "description": null,
-                            "args": [],
-                            "type": {
-                                "kind": "NON_NULL",
-                                "name": null,
-                                "ofType": {
-                                    "kind": "OBJECT",
-                                    "name": "JiraBoard_v1",
-                                    "ofType": null
-                                }
-                            },
-                            "isDeprecated": false,
-                            "deprecationReason": null
-                        },
-                        {
-                            "name": "imageRef",
-                            "description": null,
-                            "args": [],
-                            "type": {
-                                "kind": "SCALAR",
-                                "name": "String",
-                                "ofType": null
-                            },
-                            "isDeprecated": false,
-                            "deprecationReason": null
-                        },
-                        {
-                            "name": "resources",
-                            "description": null,
-                            "args": [],
-                            "type": {
-                                "kind": "OBJECT",
-                                "name": "DeployResources_v1",
-                                "ofType": null
-                            },
-                            "isDeprecated": false,
-                            "deprecationReason": null
-                        },
-                        {
-                            "name": "disabled",
-                            "description": null,
-                            "args": [],
-                            "type": {
-                                "kind": "SCALAR",
-                                "name": "Boolean",
-                                "ofType": null
-                            },
-                            "isDeprecated": false,
-                            "deprecationReason": null
-                        }
-                    ],
-                    "inputFields": null,
-                    "interfaces": [],
-                    "enumValues": null,
-                    "possibleTypes": null
-                },
                 {
                     "kind": "OBJECT",
                     "name": "StaticSubSharding_v1",

reconcile/integrations_manager.py

@@ -41,7 +41,6 @@ from reconcile.utils.runtime.sharding import (
     AWSAccountShardingStrategy,
     CloudflareDnsZoneShardingStrategy,
     IntegrationShardManager,
-    JiraBoardShardingStrategy,
     OCMOrganizationShardingStrategy,
     OpenshiftClusterShardingStrategy,
     ShardSpec,
@@ -258,7 +257,6 @@ def run(
             OpenshiftClusterShardingStrategy.IDENTIFIER: OpenshiftClusterShardingStrategy(),
             CloudflareDnsZoneShardingStrategy.IDENTIFIER: CloudflareDnsZoneShardingStrategy(),
             OCMOrganizationShardingStrategy.IDENTIFIER: OCMOrganizationShardingStrategy(),
-            JiraBoardShardingStrategy.IDENTIFIER: JiraBoardShardingStrategy(),
         },
         integration_runtime_meta=integration_runtime_meta,
     )

reconcile/jira_permissions_validator.py

@@ -1,5 +1,6 @@
 import logging
 import sys
+import time
 from collections.abc import Callable, Iterable
 from enum import IntFlag, auto
 from typing import Any, TypedDict
@@ -20,18 +21,21 @@ from reconcile.typed_queries.app_interface_vault_settings import (
 from reconcile.typed_queries.jira_settings import get_jira_settings
 from reconcile.typed_queries.jiralert_settings import get_jiralert_settings
 from reconcile.utils import gql, metrics
+from reconcile.utils.defer import defer
 from reconcile.utils.disabled_integrations import integration_is_enabled
 from reconcile.utils.extended_early_exit import (
     ExtendedEarlyExitRunnerResult,
     extended_early_exit_run,
 )
 from reconcile.utils.jira_client import JiraClient, JiraWatcherSettings
+from reconcile.utils.runtime.integration import DesiredStateShardConfig
 from reconcile.utils.secret_reader import SecretReaderBase, create_secret_reader
 from reconcile.utils.semver_helper import make_semver
+from reconcile.utils.state import State, init_state
 from reconcile.utils.unleash import get_feature_toggle_state
 
 QONTRACT_INTEGRATION = "jira-permissions-validator"
-QONTRACT_INTEGRATION_VERSION = make_semver(1, 1, 0)
+QONTRACT_INTEGRATION_VERSION = make_semver(1, 2, 0)
 
 NameToIdMap = dict[str, str]
 
@@ -66,6 +70,7 @@ class ValidationError(IntFlag):
 
 class RunnerParams(TypedDict):
     boards: list[JiraBoardV1]
+    board_check_interval: int
     dry_run: bool
 
 
@@ -201,12 +206,19 @@ def validate_boards(
     jira_boards: Iterable[JiraBoardV1],
     default_issue_type: str,
     default_reopen_state: str,
+    board_check_interval: int,
     dry_run: bool,
+    state: State,
     jira_client_class: type[JiraClient] = JiraClient,
 ) -> bool:
     error = False
     jira_clients: dict[str, JiraClient] = {}
     for board in jira_boards:
+        last_successful_run = state.get(board.name, 0)
+        if not dry_run and time.time() <= last_successful_run + board_check_interval:
+            logging.debug(f"[{board.name}] Skipping board")
+            continue
+
         logging.debug(f"[{board.name}] checking ...")
         if board.server.server_url not in jira_clients:
             jira_clients[board.server.server_url] = jira_client_class.create(
@@ -230,6 +242,9 @@ def validate_boards(
                 case 0:
                     # no errors
                     logging.debug(f"[{board.name}] is valid")
+                    if not dry_run:
+                        # remember time of the last successful run
+                        state[board.name] = time.time()
                 case ValidationError.PERMISSION_ERROR:
                     # we don't have all the permissions, but we can create jira tickets
                     metrics_container.set_gauge(
@@ -257,13 +272,17 @@ def validate_boards(
 
 
 def get_jira_boards(
-    query_func: Callable, jira_board_name: str | None = None
+    query_func: Callable,
+    jira_board_names: list[str] | None = None,
 ) -> list[JiraBoardV1]:
     return [
         board
         for board in query_jira_boards(query_func=query_func).jira_boards or []
         if integration_is_enabled(QONTRACT_INTEGRATION, board)
-        and (not jira_board_name or board.name.lower() == jira_board_name.lower())
+        and (
+            not jira_board_names
+            or board.name.lower() in [name.lower() for name in jira_board_names]
+        )
     ]
 
 
@@ -273,16 +292,18 @@ def export_boards(boards: list[JiraBoardV1]) -> list[dict]:
 
 def run(
     dry_run: bool,
-    jira_board_name: str | None = None,
+    jira_board_name: list[str] | None = None,
+    board_check_interval: int = 3600,
     enable_extended_early_exit: bool = False,
     extended_early_exit_cache_ttl_seconds: int = 3600,
     log_cached_log_output: bool = False,
 ) -> None:
     gql_api = gql.get_api()
-    boards = get_jira_boards(query_func=gql_api.query, jira_board_name=jira_board_name)
+    boards = get_jira_boards(query_func=gql_api.query, jira_board_names=jira_board_name)
     runner_params: RunnerParams = {
         "boards": boards,
         "dry_run": dry_run,
+        "board_check_interval": board_check_interval,
     }
     if enable_extended_early_exit and get_feature_toggle_state(
         "jira-permissions-validator-extended-early-exit",
@@ -300,7 +321,7 @@ def run(
             # don't use `dry_run` in the cache key because this is a read-only integration
             dry_run=False,
             cache_source=cache_source,
-            shard=jira_board_name or "",
+            shard="_".join(set(jira_board_name)) if jira_board_name else "",
             ttl_seconds=extended_early_exit_cache_ttl_seconds,
             logger=logging.getLogger(),
             runner=runner,
@@ -312,12 +333,21 @@ def run(
         runner(**runner_params)
 
 
-def runner(boards: list[JiraBoardV1], dry_run: bool) -> ExtendedEarlyExitRunnerResult:
+@defer
+def runner(
+    boards: list[JiraBoardV1],
+    dry_run: bool,
+    board_check_interval: int,
+    defer: Callable | None = None,
+) -> ExtendedEarlyExitRunnerResult:
     gql_api = gql.get_api()
     settings = get_jira_settings(gql_api=gql_api)
     jiralert_settings = get_jiralert_settings(query_func=gql_api.query)
     vault_settings = get_app_interface_vault_settings()
     secret_reader = create_secret_reader(use_vault=vault_settings.vault)
+    state = init_state(integration=QONTRACT_INTEGRATION, secret_reader=secret_reader)
+    if defer:
+        defer(state.cleanup)
 
     with metrics.transactional_metrics("jira-boards") as metrics_container:
         error = validate_boards(
@@ -327,7 +357,9 @@ def runner(boards: list[JiraBoardV1], dry_run: bool) -> ExtendedEarlyExitRunnerR
             jira_boards=boards,
             default_issue_type=jiralert_settings.default_issue_type,
             default_reopen_state=jiralert_settings.default_reopen_state,
+            board_check_interval=board_check_interval,
             dry_run=dry_run,
+            state=state,
         )
 
     if error:
@@ -337,13 +369,22 @@ def runner(boards: list[JiraBoardV1], dry_run: bool) -> ExtendedEarlyExitRunnerR
 
 
 def early_exit_desired_state(
-    *args: Any, jira_board_name: str | None = None, **kwargs: Any
+    *args: Any, jira_board_name: list[str] | None = None, **kwargs: Any
 ) -> dict[str, Any]:
     return {
         "boards": export_boards(
             get_jira_boards(
                 query_func=gql.get_api().query,
-                jira_board_name=jira_board_name,
+                jira_board_names=jira_board_name,
             )
         )
     }
+
+
+def desired_state_shard_config() -> DesiredStateShardConfig:
+    return DesiredStateShardConfig(
+        shard_arg_name="jira_board_name",
+        shard_path_selectors={"boards[*].name"},
+        shard_arg_is_collection=True,
+        sharded_run_review=lambda proposal: len(proposal.proposed_shards) <= 2,
+    )

reconcile/utils/github_api.py

@@ -3,11 +3,7 @@ from pathlib import Path
 from types import TracebackType
 from urllib.parse import urlparse
 
-from github import (
-    Commit,
-    Github,
-    UnknownObjectException,
-)
+from github import Commit, Github, GithubException, UnknownObjectException
 from sretoolbox.utils import retry
 
 GH_BASE_URL = os.environ.get("GITHUB_API", "https://api.github.com")
@@ -75,6 +71,13 @@ class GithubRepositoryApi:
                 # -> for now staying backwards compatible
                 return None
             return content.decoded_content
+        except GithubException as e:
+            # handling a bug in the upstream GH library
+            # https://github.com/PyGithub/PyGithub/issues/3179
+            if e.status == 404:
+                return None
+            else:
+                raise e
         except UnknownObjectException:
             return None
 

reconcile/utils/runtime/sharding.py

@@ -19,8 +19,6 @@ from reconcile.gql_definitions.integrations.integrations import (
     IntegrationManagedV1,
     IntegrationShardingV1,
     IntegrationSpecV1,
-    JiraBoardShardingV1,
-    JiraBoardShardSpecOverrideV1,
     OCMOrganizationShardingV1,
     OCMOrganizationShardSpecOverrideV1,
     OpenshiftClusterShardingV1,
@@ -30,7 +28,6 @@ from reconcile.gql_definitions.integrations.integrations import (
     SubShardingV1,
 )
 from reconcile.gql_definitions.sharding import aws_accounts as sharding_aws_accounts
-from reconcile.gql_definitions.sharding import jira_boards as sharding_jira_boards
 from reconcile.gql_definitions.sharding import (
     ocm_organization as sharding_ocm_organization,
 )
@@ -437,67 +434,6 @@ class CloudflareDnsZoneShardingStrategy:
         return shards
 
 
-class JiraBoardShardingStrategy:
-    IDENTIFIER = "per-jira-board"
-
-    def __init__(
-        self,
-        jira_boards: Iterable[sharding_jira_boards.JiraBoardV1] | None = None,
-    ):
-        if not jira_boards:
-            self.jira_boards = (
-                sharding_jira_boards.query(query_func=gql.get_api().query).jira_boards
-                or []
-            )
-        else:
-            self.jira_boards = list(jira_boards)
-
-    def get_shard_spec_overrides(
-        self, sharding: IntegrationShardingV1 | None
-    ) -> dict[str, JiraBoardShardSpecOverrideV1]:
-        spos: dict[str, JiraBoardShardSpecOverrideV1] = {}
-
-        if isinstance(sharding, JiraBoardShardingV1) and sharding.shard_spec_overrides:
-            for sp in sharding.shard_spec_overrides or []:
-                spos[sp.shard.name] = sp
-        return spos
-
-    def check_integration_sharding_params(self, meta: IntegrationMeta) -> None:
-        if "--jira-board-name" not in meta.args:
-            raise ValueError(
-                f"the integration {meta.name} does not support the required argument "
-                " --jira-board-name for the 'per-jira-board' sharding strategy."
-            )
-
-    def build_shard_spec(
-        self,
-        jira_board: sharding_jira_boards.JiraBoardV1,
-        integration_spec: IntegrationSpecV1,
-        spo: JiraBoardShardSpecOverrideV1 | None,
-    ) -> ShardSpec:
-        return ShardSpec(
-            shard_key=jira_board.name,
-            shard_name_suffix=f"-{jira_board.name.lower()}",
-            extra_args=(integration_spec.extra_args or "")
-            + f" --jira-board-name {jira_board.name}",
-            shard_spec_overrides=spo,
-        )
-
-    def build_integration_shards(
-        self,
-        integration_meta: IntegrationMeta,
-        integration_managed: IntegrationManagedV1,
-    ) -> list[ShardSpec]:
-        self.check_integration_sharding_params(integration_meta)
-        spos = self.get_shard_spec_overrides(integration_managed.sharding)
-        shards = []
-        for board in self.jira_boards:
-            spo = spos.get(board.name)
-            base_shard = self.build_shard_spec(board, integration_managed.spec, spo)
-            shards.append(base_shard)
-        return shards
-
-
 @dataclass
 class IntegrationShardManager:
     strategies: dict[str, ShardingStrategy]

reconcile/gql_definitions/sharding/jira_boards.py

@@ -1,60 +0,0 @@
-"""
-Generated by qenerate plugin=pydantic_v1. DO NOT MODIFY MANUALLY!
-"""
-from collections.abc import Callable  # noqa: F401 # pylint: disable=W0611
-from datetime import datetime  # noqa: F401 # pylint: disable=W0611
-from enum import Enum  # noqa: F401 # pylint: disable=W0611
-from typing import (  # noqa: F401 # pylint: disable=W0611
-    Any,
-    Optional,
-    Union,
-)
-
-from pydantic import (  # noqa: F401 # pylint: disable=W0611
-    BaseModel,
-    Extra,
-    Field,
-    Json,
-)
-
-
-DEFINITION = """
-query JiraBoardSharding {
-  jira_boards: jira_boards_v1 {
-    name
-  }
-}
-"""
-
-
-class ConfiguredBaseModel(BaseModel):
-    class Config:
-        smart_union=True
-        extra=Extra.forbid
-
-
-class JiraBoardV1(ConfiguredBaseModel):
-    name: str = Field(..., alias="name")
-
-
-class JiraBoardShardingQueryData(ConfiguredBaseModel):
-    jira_boards: Optional[list[JiraBoardV1]] = Field(..., alias="jira_boards")
-
-
-def query(query_func: Callable, **kwargs: Any) -> JiraBoardShardingQueryData:
-    """
-    This is a convenience function which queries and parses the data into
-    concrete types. It should be compatible with most GQL clients.
-    You do not have to use it to consume the generated data classes.
-    Alternatively, you can also mime and alternate the behavior
-    of this function in the caller.
-
-    Parameters:
-        query_func (Callable): Function which queries your GQL Server
-        kwargs: optional arguments that will be passed to the query function
-
-    Returns:
-        JiraBoardShardingQueryData: queried data parsed into generated classes
-    """
-    raw_data: dict[Any, Any] = query_func(DEFINITION, **kwargs)
-    return JiraBoardShardingQueryData(**raw_data)