Removing AuditLogPublisherService references

cdapio · Oct 23, 2024 · 2022069 · 2022069
1 parent 4e58000
commit 2022069
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 143 deletions.
diff --git a/cdap-app-fabric/src/main/java/io/cdap/cdap/app/guice/AppFabricServiceRuntimeModule.java b/cdap-app-fabric/src/main/java/io/cdap/cdap/app/guice/AppFabricServiceRuntimeModule.java
@@ -34,7 +34,6 @@
 import com.google.inject.name.Named;
 import com.google.inject.name.Names;
 import com.google.inject.util.Modules;
-import io.cdap.cdap.api.auditlogging.AuditLogPublisherService;
 import io.cdap.cdap.api.feature.FeatureFlagsProvider;
 import io.cdap.cdap.app.deploy.Configurator;
 import io.cdap.cdap.app.deploy.Manager;
@@ -153,7 +152,6 @@
 import io.cdap.cdap.scheduler.CoreSchedulerService;
 import io.cdap.cdap.scheduler.Scheduler;
 import io.cdap.cdap.securestore.spi.SecretStore;
-import io.cdap.cdap.security.auth.service.DefaultAuditLogPublisherService;
 import io.cdap.cdap.security.encryption.guice.DataStorageAeadEncryptionModule;
 import io.cdap.cdap.security.impersonation.DefaultOwnerAdmin;
 import io.cdap.cdap.security.impersonation.DefaultUGIProvider;
@@ -435,7 +433,6 @@ protected void configure() {
       bind(EventSubscriberManager.class).in(Scopes.SINGLETON);
       bind(EventWriterProvider.class).to(EventWriterExtensionProvider.class);
       bind(MetricsProvider.class).to(SparkProgramStatusMetricsProvider.class);
-      bind(AuditLogPublisherService.class).to(DefaultAuditLogPublisherService.class);
 
       Multibinder<HttpHandler> handlerBinder = Multibinder.newSetBinder(
           binder(), HttpHandler.class, Names.named(Constants.AppFabric.HANDLERS_BINDING));

diff --git a/cdap-app-fabric/src/main/java/io/cdap/cdap/app/preview/DefaultPreviewRunnerManager.java b/cdap-app-fabric/src/main/java/io/cdap/cdap/app/preview/DefaultPreviewRunnerManager.java
@@ -27,7 +27,6 @@
 import com.google.inject.Scopes;
 import com.google.inject.name.Named;
 import com.google.inject.util.Modules;
-import io.cdap.cdap.api.auditlogging.AuditLogPublisherService;
 import io.cdap.cdap.api.security.store.SecureStore;
 import io.cdap.cdap.app.guice.ProgramRunnerRuntimeModule;
 import io.cdap.cdap.common.NotFoundException;
@@ -56,7 +55,6 @@
 import io.cdap.cdap.metrics.guice.MetricsClientRuntimeModule;
 import io.cdap.cdap.proto.id.ApplicationId;
 import io.cdap.cdap.security.auth.context.AuthenticationContextModules;
-import io.cdap.cdap.security.auth.service.DefaultAuditLogPublisherService;
 import io.cdap.cdap.security.guice.CoreSecurityRuntimeModule;
 import io.cdap.cdap.security.guice.preview.PreviewSecureStoreModule;
 import java.net.InetAddress;
@@ -205,12 +203,6 @@ protected void configure() {
                 bind(MetadataServiceClient.class).to(NoOpMetadataServiceClient.class);
               }
             }),
-        new AbstractModule() {
-          @Override
-          protected void configure() {
-            bind(AuditLogPublisherService.class).to(DefaultAuditLogPublisherService.class).in(Scopes.SINGLETON);
-          }
-        },
         new ProvisionerModule(),
         new AbstractModule() {
           @Override

diff --git a/cdap-common/src/main/java/io/cdap/cdap/api/auditlogging/AuditLogPublisherService.java b/cdap-common/src/main/java/io/cdap/cdap/api/auditlogging/AuditLogPublisherService.java
diff --git a/cdap-master/src/main/java/io/cdap/cdap/master/environment/k8s/AppFabricServiceMain.java b/cdap-master/src/main/java/io/cdap/cdap/master/environment/k8s/AppFabricServiceMain.java
@@ -24,7 +24,6 @@
 import com.google.inject.Module;
 import com.google.inject.Scopes;
 import com.google.inject.util.Modules;
-import io.cdap.cdap.api.auditlogging.AuditLogPublisherService;
 import io.cdap.cdap.app.guice.AppFabricServiceRuntimeModule;
 import io.cdap.cdap.app.guice.AuthorizationModule;
 import io.cdap.cdap.app.guice.MonitorHandlerModule;
@@ -61,7 +60,6 @@
 import io.cdap.cdap.operations.OperationalStatsService;
 import io.cdap.cdap.operations.guice.OperationalStatsModule;
 import io.cdap.cdap.proto.id.NamespaceId;
-import io.cdap.cdap.security.auth.service.DefaultAuditLogPublisherService;
 import io.cdap.cdap.security.authorization.AccessControllerInstantiator;
 import io.cdap.cdap.security.authorization.AuthorizationEnforcementModule;
 import io.cdap.cdap.security.guice.SecureStoreServerModule;
@@ -125,7 +123,6 @@ protected void configure() {
             // TODO (CDAP-14677): find a better way to inject metadata publisher
             bind(MetadataPublisher.class).to(MessagingMetadataPublisher.class);
             bind(MetadataServiceClient.class).to(DefaultMetadataServiceClient.class);
-            bind(AuditLogPublisherService.class).to(DefaultAuditLogPublisherService.class);
           }
         }
     );
@@ -161,8 +158,6 @@ protected void addServices(Injector injector, List<? super Service> services,
         () -> injector.getInstance(NamespaceInitializerService.class),
         RetryStrategies.exponentialDelay(200, 5000, TimeUnit.MILLISECONDS)));
 
-    services.add(injector.getInstance(AuditLogPublisherService.class));
-
     if (cConf.getBoolean(Constants.TaskWorker.POOL_ENABLE)) {
       services.add(injector.getInstance(TaskWorkerServiceLauncher.class));
     }

diff --git a/...ity/src/main/java/io/cdap/cdap/security/auth/service/DefaultAuditLogPublisherService.java b/...ity/src/main/java/io/cdap/cdap/security/auth/service/DefaultAuditLogPublisherService.java