sijie closed pull request #2053: fix bug with specifying jar via config file
URL: https://github.com/apache/incubator-pulsar/pull/2053
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdFunctions.java
b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdFunctions.java
index 590029525e..b8bf018040 100644
---
a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdFunctions.java
+++
b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdFunctions.java
@@ -715,8 +715,8 @@ void runCmd() throws Exception {
class CreateFunction extends FunctionDetailsCommand {
@Override
void runCmd() throws Exception {
- if (Utils.isFunctionPackageUrlSupported(jarFile)) {
-
admin.functions().createFunctionWithUrl(convert(functionConfig), jarFile);
+ if (Utils.isFunctionPackageUrlSupported(functionConfig.getJar())) {
+
admin.functions().createFunctionWithUrl(convert(functionConfig),
functionConfig.getJar());
} else {
admin.functions().createFunction(convert(functionConfig),
userCodeFile);
}
@@ -758,8 +758,8 @@ void runCmd() throws Exception {
class UpdateFunction extends FunctionDetailsCommand {
@Override
void runCmd() throws Exception {
- if (Utils.isFunctionPackageUrlSupported(jarFile)) {
-
admin.functions().updateFunctionWithUrl(convert(functionConfig), jarFile);
+ if (Utils.isFunctionPackageUrlSupported(functionConfig.getJar())) {
+
admin.functions().updateFunctionWithUrl(convert(functionConfig),
functionConfig.getJar());
} else {
admin.functions().updateFunction(convert(functionConfig),
userCodeFile);
}
diff --git
a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSinks.java
b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSinks.java
index 9d4595ba4f..87b596f190 100644
---
a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSinks.java
+++
b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSinks.java
@@ -135,7 +135,7 @@ void runCmd() throws Exception {
.tlsAllowInsecureConnection(tlsAllowInsecureConnection)
.tlsHostnameVerificationEnable(tlsHostNameVerificationEnabled)
.tlsTrustCertsFilePath(tlsTrustCertFilePath).build(),
- jarFile, admin);
+ sinkConfig.getJar(), admin);
}
}
@@ -144,9 +144,9 @@ void runCmd() throws Exception {
@Override
void runCmd() throws Exception {
if (Utils.isFunctionPackageUrlSupported(jarFile)) {
-
admin.functions().createFunctionWithUrl(createSinkConfig(sinkConfig), jarFile);
+
admin.functions().createFunctionWithUrl(createSinkConfig(sinkConfig),
sinkConfig.getJar());
} else {
- admin.functions().createFunction(createSinkConfig(sinkConfig),
jarFile);
+ admin.functions().createFunction(createSinkConfig(sinkConfig),
sinkConfig.getJar());
}
print("Created successfully");
}
@@ -157,9 +157,9 @@ void runCmd() throws Exception {
@Override
void runCmd() throws Exception {
if (Utils.isFunctionPackageUrlSupported(jarFile)) {
-
admin.functions().updateFunctionWithUrl(createSinkConfig(sinkConfig), jarFile);
+
admin.functions().updateFunctionWithUrl(createSinkConfig(sinkConfig),
sinkConfig.getJar());
} else {
- admin.functions().updateFunction(createSinkConfig(sinkConfig),
jarFile);
+ admin.functions().updateFunction(createSinkConfig(sinkConfig),
sinkConfig.getJar());
}
print("Updated successfully");
}
diff --git
a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSources.java
b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSources.java
index 2ff338de0e..8184aa6ac0 100644
---
a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSources.java
+++
b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSources.java
@@ -130,7 +130,7 @@ void runCmd() throws Exception {
.tlsAllowInsecureConnection(tlsAllowInsecureConnection)
.tlsHostnameVerificationEnable(tlsHostNameVerificationEnabled)
.tlsTrustCertsFilePath(tlsTrustCertFilePath).build(),
- jarFile, admin);
+ sourceConfig.getJar(), admin);
}
}
@@ -138,10 +138,10 @@ void runCmd() throws Exception {
public class CreateSource extends SourceCommand {
@Override
void runCmd() throws Exception {
- if (Utils.isFunctionPackageUrlSupported(jarFile)) {
-
admin.functions().createFunctionWithUrl(createSourceConfig(sourceConfig),
jarFile);
+ if
(Utils.isFunctionPackageUrlSupported(this.sourceConfig.getJar())) {
+
admin.functions().createFunctionWithUrl(createSourceConfig(sourceConfig),
sourceConfig.getJar());
} else {
-
admin.functions().createFunction(createSourceConfig(sourceConfig), jarFile);
+
admin.functions().createFunction(createSourceConfig(sourceConfig),
sourceConfig.getJar());
}
print("Created successfully");
}
@@ -151,10 +151,10 @@ void runCmd() throws Exception {
public class UpdateSource extends SourceCommand {
@Override
void runCmd() throws Exception {
- if (Utils.isFunctionPackageUrlSupported(jarFile)) {
-
admin.functions().updateFunctionWithUrl(createSourceConfig(sourceConfig),
jarFile);
+ if (Utils.isFunctionPackageUrlSupported(sourceConfig.getJar())) {
+
admin.functions().updateFunctionWithUrl(createSourceConfig(sourceConfig),
sourceConfig.getJar());
} else {
-
admin.functions().updateFunction(createSourceConfig(sourceConfig), jarFile);
+
admin.functions().updateFunction(createSourceConfig(sourceConfig),
sourceConfig.getJar());
}
print("Updated successfully");
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
