Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(serve): allow setting ssl certificate in angular-cli.json #4730

Merged
merged 2 commits into from
Feb 22, 2017

Conversation

itslenny
Copy link
Contributor

Currently users must use the --ssl, -ssl-cert, -ssl-key flags to run the
server using an ssl certificate. This update allows users to set
those options in default.serve so they can just run ng serve without any
flags.

Copy link
Contributor

@filipesilva filipesilva left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Heya, this is a nice solid PR.

It seems to need a rebase though, and it's failing on appveyor:

Running "tests\misc\ssl-default-config" (89 of 100)...
Last step took 0.02s...
Error: ENOENT: no such file or directory, open 'C:\Users\appveyor\AppData\Local\Temp\1\angular-cli-e2e-117116-1040-1qtheza.r92jnpzaor\test-project\angular-cli.json'
Test "tests\misc\ssl-default-config" failed...
ENOENT: no such file or directory, open 'C:\Users\appveyor\AppData\Local\Temp\1\angular-cli-e2e-117116-1040-1qtheza.r92jnpzaor\test-project\angular-cli.json'
Error: ENOENT: no such file or directory, open 'C:\Users\appveyor\AppData\Local\Temp\1\angular-cli-e2e-117116-1040-1qtheza.r92jnpzaor\test-project\angular-cli.json'

The error seems to be due to the config filename, probably because it needs a dot now (.angular-cli.json). Not sure why travis didn't fail on that though.

@filipesilva
Copy link
Contributor

I should mention that there is some time pressure to get this in due to RC0. I'm not sure we can add it afterwards since it does change the config api.

@itslenny itslenny force-pushed the AddSupportForSSLInCliJson branch 2 times, most recently from 6fca389 to d20e1be Compare February 22, 2017 19:18
Currently users must use the --ssl, -ssl-cert, -ssl-key flags to run the
server using an ssl certificate. This update allows users to set
those options in default.serve so they can just run `ng serve` without any
flags.
@itslenny itslenny force-pushed the AddSupportForSSLInCliJson branch from d20e1be to 952500f Compare February 22, 2017 19:23
@filipesilva
Copy link
Contributor

@itslenny I added my approval but it's contingent on CI passing, per usual.

@itslenny
Copy link
Contributor Author

@filipesilva I got a failure on Travis that doesn't seem to be related to my change. Is this a known flaky test? It only failed in one of the environments.

�[37m  �[34mRunning `ng "e2e" "--watch" "--live-reload"` [silent, matching(/Spec started/)]...�[37m�[39m
�[37m  �[34mCWD: /tmp/angular-cli-e2e-117122-3895-lldysh.vkfp5sif6r/test-project�[37m�[39m
�[37mtravis_fold:end:tests.misc.live-reload�[39m
�[37m�[32mLast step took �[37m�[1m�[34m24.38�[37m�[22m�[32ms...�[37m�[39m

�[31mError: Expected API to have been called 2 times but it was called 1 times.�[39m
�[37m
�[39m
�[31m�[31mTest "tests/misc/live-reload" failed...�[31m�[39m
�[31m�[31mExpected API to have been called 2 times but it was called 1 times.�[31m�[39m
�[31m�[31mError: Expected API to have been called 2 times but it was called 1 times.
    at Promise.resolve.then.then.then.then.then.then.then._ (/home/travis/build/angular/angular-cli/tests/e2e/tests/misc/live-reload.ts:62:19)�[31m�[39m

@filipesilva
Copy link
Contributor

Yes that test is flaky sometimes. I have ran into it today as well. I'll restart that job.

@hansl hansl merged commit b498549 into angular:master Feb 22, 2017
@filipesilva
Copy link
Contributor

@itslenny thanks for your work getting this in!

asnowwolf pushed a commit to asnowwolf/angular-cli that referenced this pull request Apr 12, 2017
…angular#4730)

Currently users must use the --ssl, -ssl-cert, -ssl-key flags to run the
server using an ssl certificate. This update allows users to set
those options in default.serve so they can just run `ng serve` without any
flags.
@angular-automatic-lock-bot
Copy link

This issue has been automatically locked due to inactivity.
Please file a new issue if you are encountering a similar or related problem.

Read more about our automatic conversation locking policy.

This action has been performed automatically by a bot.

@angular-automatic-lock-bot angular-automatic-lock-bot bot locked and limited conversation to collaborators Sep 11, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants