Skip to content
This repository was archived by the owner on Nov 16, 2023. It is now read-only.

Commit 675ff80

Browse files
DariuszPorowskin3wt0ndmckinstrydependabot[bot]BSamodien
authored
Openhack refresh (#301)
* Migrated POI APIs to netcore 3.1 and implemented the native healthchecks (#194) * Properly upgraded to netcore 2.2 * updated POI to netcore 3.0 * updated UnitTest to netcore 3.0 * updated IntegrationTest to netcore 3.0 * updated POI to netcore 3.1 * updated UnitTest to netcore 3.1 * updated IntegrationTest to netcore 3.1 * Cleanup * Small refactoring * Updated packages to latest version * Migrate Health Checks to netcore 3.1 standard * Migrate Health Checks to netcore 3.1 standard * Migrate Health Checks to netcore 3.1 standard * Ensure DB is created * Added proper references to the README files * Updated Dockerfile for netcore 3.1 * Fix * Dmckinstry/v2 consolidated (#201) * Dmckinstry/java updates (#196) * Remove HELM Charts Cleanup POM dependencies Update to JRE8 * Cleanup imports / compiler warnings * Bump acorn from 5.7.1 to 5.7.4 in /apis/userprofile (#197) Bumps [acorn](https://github.com/acornjs/acorn) from 5.7.1 to 5.7.4. - [Release notes](https://github.com/acornjs/acorn/releases) - [Commits](acornjs/acorn@5.7.1...5.7.4) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump js-yaml from 3.12.0 to 3.13.1 in /apis/userprofile (#198) Bumps [js-yaml](https://github.com/nodeca/js-yaml) from 3.12.0 to 3.13.1. - [Release notes](https://github.com/nodeca/js-yaml/releases) - [Changelog](https://github.com/nodeca/js-yaml/blob/master/CHANGELOG.md) - [Commits](nodeca/js-yaml@3.12.0...3.13.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump lodash from 4.17.10 to 4.17.15 in /apis/userprofile (#199) Bumps [lodash](https://github.com/lodash/lodash) from 4.17.10 to 4.17.15. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](lodash/lodash@4.17.10...4.17.15) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump morgan from 1.9.0 to 1.9.1 in /apis/userprofile (#200) Bumps [morgan](https://github.com/expressjs/morgan) from 1.9.0 to 1.9.1. - [Release notes](https://github.com/expressjs/morgan/releases) - [Changelog](https://github.com/expressjs/morgan/blob/master/HISTORY.md) - [Commits](expressjs/morgan@1.9.0...1.9.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Delete all HELM charts Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Removed AKS references fom Readme (#207) * Enpolat/204 update swagger versions (#205) * swagger aspnetcore version bumped * swagger version bumped * unneccessary sections removed * main method is a one-liner * commented code piece removed * swagger generator middleware re-styled and description added * redundant yaml file removed * description field added * schemas list removed in order to make it look-a-like with the other apis swagger uis * http method names uppercased, no need to do it during runtime * latest go version added to module * go dependency bumped * swagger ui dependency bumped * testify version bumped * swagger dependency version bumped to latest version * mssql dependency added, in case machine does not have it * api name modified, description added * url paths changed to make it look like similar to other apis swagger uis * name of the api modified and description field added * schemas removed * tags field added, so all the operations will be presented under the same section * unneccessary field removed * default response model renamed * lock file updated with the latest versions of the dependencies * all dependency versions bumped * latest version of swaggerui dependency added * unneccessary dependency removed * code modified, according to the changes of the latest version of swagger ui dependency * no need to set go version 1.11 * golang version bumped to latest in the build stage * dropped buster from the golang tag * dependency versions bumped * localhost part removed from swagger json url * updating user java pom.xml to add in missing sql server dependency (#216) * updating user java pom.xml to add in missing sql server dependency * removing extra mockito-core dependency * Adding Version Endpoints to all apis (#217) * poi version * adding version to trips * initial java version * adding version for userprofile * adding newlines to certain files to satisfy linter * fixed runtime dependencies of user profile (#218) * POI - Increased Code Coverage (#219) * added more poi unit tests * added healthcheck and POIConfig tests * Trips Increased Code Coverage (#220) * moved golang tests to support coverage * added more queries unit tests * refactored queries test to use assert * added version tests * renamed healthcheck test file and added swagger service tests * Added swagger service missing file test * added logger tests * added more query tests * fixed integration tests and bug in gettripsforuser query * Added dataaccess integration tests * added failure tests for tripsservice * Added cleanup to data access test * updated readme for trips to include unit and integratino test instructions * fixes userprofile unit tests (#227) * Bump path-parse from 1.0.5 to 1.0.7 in /apis/userprofile (#286) Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.5 to 1.0.7. - [Release notes](https://github.com/jbgutierrez/path-parse/releases) - [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7) --- updated-dependencies: - dependency-name: path-parse dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Dariusz Porowski <3431813+DariuszPorowski@users.noreply.github.com> * Bump lodash from 4.17.10 to 4.17.21 in /apis/userprofile (#277) Bumps [lodash](https://github.com/lodash/lodash) from 4.17.10 to 4.17.21. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](lodash/lodash@4.17.10...4.17.21) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Dariusz Porowski <3431813+DariuszPorowski@users.noreply.github.com> * Bump extend from 3.0.0 to 3.0.2 in /apis/userprofile (#177) Bumps [extend](https://github.com/justmoon/node-extend) from 3.0.0 to 3.0.2. - [Release notes](https://github.com/justmoon/node-extend/releases) - [Changelog](https://github.com/justmoon/node-extend/blob/master/CHANGELOG.md) - [Commits](justmoon/node-extend@v3.0.0...v3.0.2) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update README.md (#299) Co-authored-by: v-rajagt <31903563+v-rajagt@users.noreply.github.com> * Ohfix master (#300) * 3.1 mcr * HealthCheckResponse (#302) Co-authored-by: Dariusz Porowski <Dariusz.Porowski@microsoft.com> * Devcontainer (#303) * added devcontainer (#226) Co-authored-by: Ben Coleman <benc.uk@gmail.com> Co-authored-by: Dariusz Porowski <Dariusz.Porowski@microsoft.com> Co-authored-by: Davide Benvegnù <davide.benvegnu@outlook.com> Co-authored-by: Dave McKinstry <dmckinstry@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Brent <BSamodien@users.noreply.github.com> Co-authored-by: Engin Polat <polatengin@hotmail.com> Co-authored-by: Hattan Shobokshi <hattan@gmail.com> Co-authored-by: Ben Coleman <benc.uk@gmail.com> Co-authored-by: v-rajagt <31903563+v-rajagt@users.noreply.github.com> Co-authored-by: Dariusz Porowski <Dariusz.Porowski@microsoft.com>
1 parent 7d5810d commit 675ff80

106 files changed

Lines changed: 5102 additions & 5376 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.devcontainer/Dockerfile

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
FROM debian:buster
2+
3+
# This Dockerfile adds a non-root user with sudo access. Use the "remoteUser"
4+
# property in devcontainer.json to use it. On Linux, the container user's GID/UIDs
5+
# will be updated to match your local UID/GID (when using the dockerFile property).
6+
# See https://aka.ms/vscode-remote/containers/non-root-user for details.
7+
ARG USERNAME=vscode
8+
ARG USER_UID=1000
9+
ARG USER_GID=$USER_UID
10+
11+
# Configure apt, install base packages, SDKs & tools
12+
RUN apt-get update \
13+
&& apt-get install -y git less procps lsb-release curl wget ca-certificates apt-transport-https gnupg \
14+
&& curl -sL https://packages.microsoft.com/config/debian/10/prod.list -o /etc/apt/sources.list.d/microsoft-prod.list \
15+
&& curl -sL https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/microsoft.asc.gpg > /dev/null \
16+
&& echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ buster main" | tee /etc/apt/sources.list.d/azure-cli.list \
17+
&& apt-get update \
18+
&& apt-get install -y azure-cli openjdk-11-jdk dotnet-sdk-3.1
19+
20+
# Golang
21+
WORKDIR /tmp
22+
RUN curl -fsS https://dl.google.com/go/go1.16.8.linux-amd64.tar.gz -o golang.tar.gz \
23+
&& tar -xvf golang.tar.gz \
24+
&& rm -rf /usr/local/go \
25+
&& mv go /usr/local
26+
ENV GO111MODULE=on
27+
ENV CGO_ENABLED=0
28+
29+
# Maven
30+
RUN curl -sSL https://downloads.apache.org/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz -o maven.tar.gz \
31+
&& tar -xzf maven.tar.gz \
32+
&& mv apache-maven-3.6.3 /opt \
33+
&& rm maven.tar.gz
34+
35+
# Node 12.x
36+
RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - \
37+
&& apt-get install -y nodejs
38+
39+
# Docker client
40+
RUN curl -sSL https://download.docker.com/linux/static/stable/x86_64/docker-20.10.8.tgz -o docker.tgz \
41+
&& tar -zxvf docker.tgz docker/docker \
42+
&& chmod +x docker/docker \
43+
&& mv docker/docker /usr/bin/docker \
44+
&& rm -rf docker \
45+
&& rm docker.tgz
46+
47+
# Create a non-root user to use if preferred - see https://aka.ms/vscode-remote/containers/non-root-user.
48+
RUN groupadd --gid $USER_GID $USERNAME \
49+
&& useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \
50+
# [Optional] Add sudo support
51+
&& apt-get install -y sudo \
52+
&& echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \
53+
&& chmod 0440 /etc/sudoers.d/$USERNAME \
54+
&& groupadd docker || true \
55+
&& usermod -aG docker $USERNAME
56+
57+
# Cleanup apt
58+
RUN apt-get autoremove -y \
59+
&& apt-get clean -y
60+
61+
# Paths and user set up
62+
RUN echo 'export PATH="$HOME/go/bin:/usr/local/go/bin:/opt/apache-maven-3.6.3/bin:$PATH"' >> /etc/bash.bashrc
63+
RUN echo 'export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64' >> /etc/bash.bashrc
64+
WORKDIR /home/$USERNAME

.devcontainer/devcontainer.json

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
{
2+
"name": "DevOps OpenHack",
3+
"dockerFile": "Dockerfile",
4+
//"runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ],
5+
// Docker in docker
6+
"mounts": [ "source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind" ],
7+
8+
// Set *default* container specific settings.json values on container create.
9+
"settings": {
10+
"terminal.integrated.shell.linux": "/bin/bash",
11+
},
12+
13+
// Add the IDs of extensions you want installed when the container is created.
14+
"extensions": [
15+
"redhat.vscode-yaml",
16+
"github.vscode-pull-request-github",
17+
"ms-vscode.azure-account",
18+
"ms-azuretools.vscode-azureappservice",
19+
"golang.go",
20+
"vscjava.vscode-java-pack",
21+
"hashicorp.terraform",
22+
"ms-azuretools.vscode-docker",
23+
"ms-vscode.vscode-node-azure-pack",
24+
"ms-azuretools.vscode-azureterraform"
25+
],
26+
27+
// Use 'forwardPorts' to make a list of ports inside the container available locally.
28+
// "forwardPorts": [],
29+
30+
// Use 'postCreateCommand' to run commands after the container is created.
31+
// "postCreateCommand": "go version",
32+
33+
// Uncomment to connect as a non-root user. See https://aka.ms/vscode-remote/containers/non-root.
34+
"remoteUser": "vscode"
35+
}

0 commit comments

Comments
 (0)