Skip to content

Commit 45f6777

Browse files
timstims
committed
fix imports and do not get gcp application default creds, leave it up to the environment
1 parent 7f0328c commit 45f6777

2 files changed

Lines changed: 3 additions & 11 deletions

File tree

‎ingestion/src/main/java/feast/ingestion/ImportJob.java‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
package feast.ingestion;
1919

2020
import com.google.api.services.bigquery.model.TableRow;
21-
import com.google.api.services.dataflow.DataflowScopes;
22-
import com.google.auth.oauth2.GoogleCredentials;
2321
import com.google.inject.Guice;
2422
import com.google.inject.Inject;
2523
import com.google.inject.Injector;
@@ -109,15 +107,11 @@ public static void main(String[] args) {
109107

110108
public static PipelineResult mainWithResult(String[] args) {
111109
log.info("Arguments: " + Arrays.toString(args));
112-
ImportJobOptions options = PipelineOptionsFactory.fromArgs(args).withValidation().as(ImportJobOptions.class);
110+
ImportJobOptions options =
111+
PipelineOptionsFactory.fromArgs(args).withValidation().as(ImportJobOptions.class);
113112
if (options.getJobName().isEmpty()) {
114113
options.setJobName(generateName());
115114
}
116-
try {
117-
options.setGcpCredential(GoogleCredentials.getApplicationDefault().createScoped(DataflowScopes.all()));
118-
} catch (IOException e) {
119-
log.error("Exception while setting gcp credential manually : ", e.getMessage());
120-
}
121115
log.info("options: " + options.toString());
122116
ImportSpec importSpec = new ImportSpecSupplier(options).get();
123117
Injector injector =

‎ingestion/src/main/java/feast/ingestion/options/ImportJobOptions.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,14 @@
1919

2020
import com.google.auto.service.AutoService;
2121
import java.util.Collections;
22-
import org.apache.beam.runners.flink.FlinkPipelineOptions;
23-
import org.apache.beam.sdk.extensions.gcp.options.GcpOptions;
2422
import org.apache.beam.sdk.metrics.MetricsSink;
2523
import org.apache.beam.sdk.options.Default;
2624
import org.apache.beam.sdk.options.Description;
2725
import org.apache.beam.sdk.options.PipelineOptions;
2826
import org.apache.beam.sdk.options.PipelineOptionsRegistrar;
2927
import org.apache.beam.sdk.options.Validation.Required;
3028

31-
public interface ImportJobOptions extends PipelineOptions, FlinkPipelineOptions, GcpOptions {
29+
public interface ImportJobOptions extends PipelineOptions {
3230
@Description("Import spec yaml file path")
3331
@Required(groups = {"importSpec"})
3432
String getImportSpecYamlFile();

0 commit comments

Comments
 (0)