Lps 123057 #1226

mtambara · 2020-11-13T00:39:54Z

Made some changes, let me know if this still fits your requirements

liferay-continuous-integration · 2020-11-13T00:40:03Z

To conserve resources, the PR Tester does not automatically run for every pull.

If your code changes were already tested in another pull, reference that pull in this pull so the test results can be analyzed.

If your pull was never tested, comment "ci:test" to run the PR Tester for this pull.

drewbrokke · 2020-11-13T14:18:15Z

ci:test:sf

drewbrokke · 2020-11-13T14:18:21Z

ci:test:relevant

drewbrokke · 2020-11-13T14:20:11Z

@jeyvison when you have a chance, please test these changes to see if they work for you. If you approve and CI passes, I can forward.

liferay-continuous-integration · 2020-11-13T14:21:47Z

✔️ ci:test:sf - 1 out of 1 jobs passed in 11 minutes

Click here for more details.

Base Branch:

Branch Name: master
Branch GIT ID: 8b082086f37d045e275f2667a67724dcf4a597b9

Sender Branch:

Branch Name: LPS-123057
Branch GIT ID: 8334c8dcd95d5ed8a4a6de32091e15dea107818f

1 out of 1jobs PASSED

1 Successful Jobs:

test-portal-source-format

For more details click here.

drewbrokke · 2020-11-13T14:33:11Z

@mtambara nevermind, that was my fault - I made a typo while trying to trigger SF.

...-impl/src/main/java/com/liferay/portal/file/install/internal/properties/TypedProperties.java

drewbrokke · 2020-11-13T14:58:58Z

ci:stop

drewbrokke · 2020-11-13T14:59:39Z

@mtambara one quick change requested, see my inline comment. I'll leave the pull open, so you can just force push an update.

liferay-continuous-integration · 2020-11-13T15:00:48Z

❌ ci:test:relevant - 0 out of 1 jobs passed in 1 hour 6 minutes

Click here for more details.

Base Branch:

Branch Name: master
Branch GIT ID: 06e707df4454e36051558b8c5deaf7600497f9ab

Copied in Private Modules Branch:

Branch Name: master-private
Branch GIT ID: 8d22a791300569a6c92e7b9152e6ae1c6bdc863a

ci:test:relevant - 0 out of 1 jobs PASSED

1 Failed Jobs:

~~test-portal-acceptance-pullrequest(master)~~

For more details click here.

Failures unique to this pull:

test-portal-acceptance-pullrequest(master)
Job Results:
0 Jobs Passed.
1 Job Failed.
```
Build was aborted
```

For upstream results, click here.

liferay-continuous-integration · 2020-11-13T15:02:03Z

Jenkins Build:test-portal-acceptance-pullrequest(master)#7938
Jenkins Report:jenkins-report.html
Jenkins Suite: sfa
Pull Request:drewbrokke#1226
Spira Release:/Liferay DXP 7.3/Pull Request/ci:test:sfa
Spira Release Build:master - mtambara > drewbrokke - PR#1226 - 2020-11-13[06:18:36]
Spira Jenkins Build:publish-spira-report#8044

liferay-continuous-integration · 2020-11-13T15:43:41Z

Jenkins Build:test-portal-acceptance-pullrequest(master)#7937
Jenkins Report:jenkins-report.html
Jenkins Suite: relevant
Pull Request:drewbrokke#1226
Spira Release:/Liferay DXP 7.3/Pull Request/ci:test:relevant
Spira Release Build:master - mtambara > drewbrokke - PR#1226 - 2020-11-13[06:18:36]
Spira Jenkins Build:publish-spira-report#9390

liferay-continuous-integration · 2020-11-13T15:44:33Z

Jenkins Build:test-portal-source-format#4871
Jenkins Report:jenkins-report.html
Jenkins Suite: sf
Pull Request:drewbrokke#1226
Spira Release:/Liferay DXP 7.3/Pull Request/ci:test:sf
Spira Release Build:master - mtambara > drewbrokke - PR#1226 - 2020-11-13[06:18:36]
Spira Jenkins Build:publish-spira-report#8050

jeyvison · 2020-11-13T17:25:16Z

Just started reviewing :)

Sent from GH.

mtambara · 2020-11-13T17:31:18Z

ci:test:sf

mtambara · 2020-11-13T17:31:24Z

ci:test:relevant

jeyvison · 2020-11-13T17:32:05Z

Just started reviewing :)

Sent from GH.

liferay-continuous-integration · 2020-11-13T17:34:38Z

✔️ ci:test:sf - 1 out of 1 jobs passed in 3 minutes

Click here for more details.

Base Branch:

Branch Name: master
Branch GIT ID: 06e707df4454e36051558b8c5deaf7600497f9ab

Sender Branch:

Branch Name: LPS-123057
Branch GIT ID: 243cdac28f51badb7100fa82ac7ee291d4b1b782

1 out of 1jobs PASSED

1 Successful Jobs:

test-portal-source-format

For more details click here.

liferay-continuous-integration · 2020-11-13T17:36:28Z

Jenkins Build:test-portal-source-format#4788
Jenkins Report:jenkins-report.html
Jenkins Suite: sf
Pull Request:drewbrokke#1226
Spira Release:/Liferay DXP 7.3/Pull Request/ci:test:sf
Spira Release Build:master - mtambara > drewbrokke - PR#1226 - 2020-11-13[09:31:45]
Spira Jenkins Build:publish-spira-report#11145

jeyvison · 2020-11-13T18:06:24Z

Hi @mtambara , Thanks a lot for you changes, the code is a lot more cleaner now :)

Two notes:

You changed back the line pattern validation so LIFERAY_ variables are not a match anymore and therefore are ignored.
The problem with removing the _propertyValuePattern validations is that if, for example, i define an Env variable like this:
LIFERAY_MY_ENV=!@#4XD this property will probably not work and we will never know why since the retrieved value from System.getEnv is not validated anymore and there is no output for letting the developer know, as we have for line pattern matching.

Does it make sense?

mtambara · 2020-11-13T18:30:50Z

Hi @jeyvison:
For your first point, LIFERAY_ variables are not being ignored, as seen in testLoadEnvVariable. They'll only be ignored if they're part of the key, but that can't be substituted so there isn't a reason to put the liferay prefix there.

For your second point, config values are allowed to be nearly any string as long as they are inside quotes, parentheses, or brackets. With my change, the substitution will still need to be inside ${} for consistency, but that would already need to be inside quotes, parentheses or brackets and would be caught by the line pattern check if it wasn't.

For example, to substitute for an env var like LIFERAY_MY_ENV=!@#4XD, you would need to have a config line like testKey = "${LIFERAY_MY_ENV}" which would get turned into testKey = "!@#4XD"

jeyvison · 2020-11-13T19:05:03Z

@mtambara Man, I completely misunderstood that! Now i got it! I just tested it here and it works perfectly :) Thanks a lot, man :)
@drewbrokke LGTM!

liferay-continuous-integration · 2020-11-13T19:26:27Z

✔️ ci:test:stable - 9 out of 9 jobs passed

✔️ ci:test:relevant - 22 out of 22 jobs passed in 1 hour 53 minutes

Click here for more details.

Base Branch:

Branch Name: master
Branch GIT ID: e066954b019e5fcf42ca45b69fd4da595ad58029

Copied in Private Modules Branch:

Branch Name: master-private
Branch GIT ID: 8d22a791300569a6c92e7b9152e6ae1c6bdc863a

ci:test:stable - 9 out of 9 jobs PASSED

9 Successful Jobs:

ci:test:relevant - 22 out of 22 jobs PASSED

22 Successful Jobs:

For more details click here.

liferay-continuous-integration · 2020-11-13T19:35:43Z

Jenkins Build:test-portal-acceptance-pullrequest(master)#4946
Jenkins Report:jenkins-report.html
Jenkins Suite: relevant
Pull Request:drewbrokke#1226
Spira Release:/Liferay DXP 7.3/Pull Request/ci:test:relevant
Spira Release Build:master - mtambara > drewbrokke - PR#1226 - 2020-11-13[09:31:48]
Spira Jenkins Build:publish-spira-report#8192

drewbrokke · 2020-11-13T20:18:07Z

ci:forward

liferay-continuous-integration · 2020-11-13T20:18:11Z

CI is automatically triggering the following test suites:

ci:test:relevant
ci:test:sf

The pull request will automatically be forwarded to the user brianchandotcom if the following test suites pass:

ci:test:relevant
ci:test:sf
ci:test:stable

liferay-continuous-integration · 2020-11-13T20:18:12Z

Skipping previously passed test suites:
ci:test:relevant
ci:test:sf

drewbrokke · 2020-11-13T20:19:28Z

FYI @dejuknow

liferay-continuous-integration · 2020-11-13T20:20:37Z

All required test suite(s) passed.
Forwarding pullrequest to brianchandotcom.

liferay-continuous-integration · 2020-11-13T20:20:58Z

Pull request has been successfully forwarded to brianchandotcom#95938

mtambara mentioned this pull request Nov 13, 2020

LPS-123057 Allow config files to use environment variables mtambara/liferay-portal#1023

Closed

liferay-continuous-integration added ci:test:sf - pending ci:test:sfa - pending ci:test:relevant - pending ci:test:stable - pending labels Nov 13, 2020

liferay-continuous-integration added ci:test:sf - success and removed ci:test:sf - pending labels Nov 13, 2020

liferay-continuous-integration added ci:test:sfa - failure and removed ci:test:sfa - pending labels Nov 13, 2020

Repository owner deleted a comment from liferay-continuous-integration Nov 13, 2020

drewbrokke removed the ci:test:sfa - failure label Nov 13, 2020

drewbrokke reviewed Nov 13, 2020

View reviewed changes

...-impl/src/main/java/com/liferay/portal/file/install/internal/properties/TypedProperties.java Outdated Show resolved Hide resolved

liferay-continuous-integration added ci:test:relevant - failure and removed ci:test:relevant - pending labels Nov 13, 2020

LPS-122967 prep next

e066954

jeyvison added 2 commits November 13, 2020 09:29

LPS-123057 Use system variables in TypedProperties

209cf57

LPS-123057 Create tests

414e079

liferay-continuous-integration removed the ci:test:sf - success label Nov 13, 2020

liferay-continuous-integration added ci:test:sf - pending ci:test:relevant - pending ci:test:stable - pending ci:test:sf - success and removed ci:test:relevant - failure ci:test:stable - pending ci:test:sf - pending labels Nov 13, 2020

liferay-continuous-integration added ci:test:relevant - success ci:test:stable - success and removed ci:test:relevant - pending ci:test:stable - pending labels Nov 13, 2020

liferay-continuous-integration mentioned this pull request Nov 13, 2020

Lps 123057 brianchandotcom/liferay-portal#95938

Closed

liferay-continuous-integration closed this Nov 13, 2020

Lps 123057 #1226

Lps 123057 #1226

Conversation

mtambara commented Nov 13, 2020

liferay-continuous-integration commented Nov 13, 2020

drewbrokke commented Nov 13, 2020

drewbrokke commented Nov 13, 2020

drewbrokke commented Nov 13, 2020

liferay-continuous-integration commented Nov 13, 2020

✔️ ci:test:sf - 1 out of 1 jobs passed in 11 minutes

Base Branch:

Sender Branch:

For more details click here.

drewbrokke commented Nov 13, 2020

drewbrokke commented Nov 13, 2020

drewbrokke commented Nov 13, 2020

liferay-continuous-integration commented Nov 13, 2020

❌ ci:test:relevant - 0 out of 1 jobs passed in 1 hour 6 minutes

Base Branch:

Copied in Private Modules Branch:

1 Failed Jobs:

For more details click here.

Failures unique to this pull:

test-portal-acceptance-pullrequest(master)

Job Results:

For upstream results, click here.

liferay-continuous-integration commented Nov 13, 2020

liferay-continuous-integration commented Nov 13, 2020

liferay-continuous-integration commented Nov 13, 2020

jeyvison commented Nov 13, 2020

mtambara commented Nov 13, 2020

mtambara commented Nov 13, 2020

jeyvison commented Nov 13, 2020

liferay-continuous-integration commented Nov 13, 2020

✔️ ci:test:sf - 1 out of 1 jobs passed in 3 minutes

Base Branch:

Sender Branch:

For more details click here.

liferay-continuous-integration commented Nov 13, 2020

jeyvison commented Nov 13, 2020

mtambara commented Nov 13, 2020

jeyvison commented Nov 13, 2020

liferay-continuous-integration commented Nov 13, 2020

✔️ ci:test:stable - 9 out of 9 jobs passed

✔️ ci:test:relevant - 22 out of 22 jobs passed in 1 hour 53 minutes

Base Branch:

Copied in Private Modules Branch:

For more details click here.

liferay-continuous-integration commented Nov 13, 2020

drewbrokke commented Nov 13, 2020

liferay-continuous-integration commented Nov 13, 2020

liferay-continuous-integration commented Nov 13, 2020

drewbrokke commented Nov 13, 2020

liferay-continuous-integration commented Nov 13, 2020

liferay-continuous-integration commented Nov 13, 2020