Skip to content

Commit

Permalink
SWATCH-2993: Remove prune subscriptions API
Browse files Browse the repository at this point in the history
The prune subscriptions API "/api/swatch-contracts/internal/subscriptions/prune" was not used anywhere, so it's deleted, so we don't need to maintain this functionality.

Added docs/kafka-topics.md to keep a list of unused topics, in case of we want to use it back in the future.
  • Loading branch information
Sgitario committed Oct 4, 2024
1 parent 609be5b commit c6e1c65
Show file tree
Hide file tree
Showing 23 changed files with 12 additions and 405 deletions.
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -792,7 +792,6 @@ Service that syncs system data from Hosted Candlepin into HBI.
| capacity-ingress | platform.rhsm-subscriptions.subscription-sync | swatch-contracts |
| capacity-ingress | platform.rhsm-subscriptions.offering-sync | swatch-contracts |
| capacity-ingress | platform.rhsm-subscriptions.capacity-reconcile | swatch-contracts |
| capacity-ingress | platform.rhsm-subscriptions.subscription-prune | swatch-subscriptions-sync |
</details>

## BASILISK (placeholder/testing PAYG product)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -154,11 +154,6 @@ public OfferingProductTags getSkuProductTags(String sku) throws ProcessingExcept
return null;
}

@Override
public RpcResponse pruneUnlistedSubscriptions() throws ProcessingException {
return null;
}

@Override
public SubscriptionResponse saveSubscriptions(Boolean reconcileCapacity, String body)
throws ProcessingException {
Expand Down
9 changes: 9 additions & 0 deletions docs/kafka-topics.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
Kafka Topics Notes
=====================

Not Used Topics
----------------------------

List of topics that were created for SWATCH services, but it's not used any longer:
- platform.rhsm-subscriptions.subscription-prune
- platform.rhsm-subscriptions.subscription-prune-task
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,11 @@
import org.candlepin.subscriptions.security.SecurityConfiguration;
import org.candlepin.subscriptions.subscription.SubscriptionServiceConfiguration;
import org.candlepin.subscriptions.tally.TallyWorkerConfiguration;
import org.candlepin.subscriptions.task.TaskQueueProperties;
import org.candlepin.subscriptions.util.LiquibaseUpdateOnlyConfiguration;
import org.candlepin.subscriptions.util.UtilConfiguration;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.actuate.autoconfigure.info.ConditionalOnEnabledInfoContributor;
import org.springframework.boot.actuate.autoconfigure.info.InfoContributorFallback;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
Expand Down Expand Up @@ -85,13 +82,6 @@ ApplicationProperties applicationProperties() {
return new ApplicationProperties();
}

@Bean
@Qualifier
@ConfigurationProperties(prefix = "rhsm-subscriptions.subscription-prune.tasks")
TaskQueueProperties pruneSubscriptionTasks() {
return new TaskQueueProperties();
}

@Bean
AuthProperties authProperties() {
return new AuthProperties();
Expand Down

This file was deleted.

This file was deleted.

5 changes: 0 additions & 5 deletions src/main/resources/application-capacity-ingress.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
SUBSCRIPTION_PRUNE_TOPIC: ${clowder.kafka.topics."platform.rhsm-subscriptions.subscription-prune".name:platform.rhsm-subscriptions.subscription-prune}
SUBSCRIPTION_EXPORT_TOPIC: ${clowder.kafka.topics."platform.export.requests".name:platform.export.requests}


Expand All @@ -10,10 +9,6 @@ rhsm-subscriptions:
truststore-type: ${clowder.privateEndpoints.export-service-service.trust-store-type}
psk: ${SWATCH_EXPORT_PSK:placeholder}
subscription-sync-enabled: ${SUBSCRIPTION_SYNC_ENABLED:true}
subscription-prune:
tasks:
topic: ${SUBSCRIPTION_PRUNE_TOPIC}
kafka-group-id: subscription-prune-worker
export:
tasks:
topic: ${SUBSCRIPTION_EXPORT_TOPIC}
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/application-worker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ rhsm-subscriptions:
seek-override-end: ${KAFKA_SEEK_OVERRIDE_END:false}
seek-override-timestamp: ${KAFKA_SEEK_OVERRIDE_TIMESTAMP:}
enabled-orgs:
target-topics-allowed: platform.rhsm-subscriptions.subscription-prune-task, platform.rhsm-subscriptions.subscription-sync-task, platform.rhsm-subscriptions.remittances-purge-task
target-topics-allowed: platform.rhsm-subscriptions.subscription-sync-task, platform.rhsm-subscriptions.remittances-purge-task
incoming:
topic: ${ENABLED_ORGS_TOPIC}
kafka-group-id: ${KAFKA_GROUP_ID:rhsm-subscriptions-enabled-orgs-processor}
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,7 @@ void testRequestIsIgnoredWhenUsingNotAllowedTargetTopic() {
}

@ParameterizedTest
@ValueSource(
strings = {
"platform.rhsm-subscriptions.subscription-prune-task",
"platform.rhsm-subscriptions.subscription-sync-task"
})
@ValueSource(strings = {"platform.rhsm-subscriptions.subscription-sync-task"})
void testRequestWithAllowedTargetTopic(String targetTopic) {
givenRequestWithTargetTopic(targetTopic);
whenSendRequest();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
"${rhsm-subscriptions.subscription-export.tasks.topic:platform.export.requests}",
"${rhsm-subscriptions.enabled-orgs.incoming.topic:platform.rhsm-subscriptions.enabled-orgs-for-tasks}",
// these following two topics are created outside of swatch-tally:
"platform.rhsm-subscriptions.subscription-prune-task",
"platform.rhsm-subscriptions.subscription-sync-task"
})
public interface ExtendWithEmbeddedKafka {
Expand Down
7 changes: 0 additions & 7 deletions swatch-contracts/deploy/clowdapp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,6 @@ parameters:
value: '3'
- name: KAFKA_ENABLED_ORGS_PARTITIONS
value: '3'
- name: KAFKA_SUBSCRIPTION_PRUNE_TASK_REPLICAS
value: '3'
- name: KAFKA_SUBSCRIPTION_PRUNE_TASK_PARTITIONS
value: '3'
- name: KAFKA_SUBSCRIPTION_SYNC_TASK_REPLICAS
value: '3'
- name: KAFKA_SUBSCRIPTION_SYNC_TASK_PARTITIONS
Expand Down Expand Up @@ -126,9 +122,6 @@ objects:
- replicas: ${{KAFKA_ENABLED_ORGS_REPLICAS}}
partitions: ${{KAFKA_ENABLED_ORGS_PARTITIONS}}
topicName: platform.rhsm-subscriptions.enabled-orgs-for-tasks
- replicas: ${{KAFKA_SUBSCRIPTION_PRUNE_TASK_REPLICAS}}
partitions: ${{KAFKA_SUBSCRIPTION_PRUNE_TASK_PARTITIONS}}
topicName: platform.rhsm-subscriptions.subscription-prune-task
- replicas: ${{KAFKA_SUBSCRIPTION_SYNC_TASK_REPLICAS}}
partitions: ${{KAFKA_SUBSCRIPTION_SYNC_TASK_PARTITIONS}}
topicName: platform.rhsm-subscriptions.subscription-sync-task
Expand Down
Loading

0 comments on commit c6e1c65

Please sign in to comment.