Permalink
Browse files

Happy new year

  • Loading branch information...
schrieveslaach committed Jan 25, 2019
1 parent 2829947 commit 881ec9cfebd086528ec2edbed006e3f6a18e293e
Showing with 139 additions and 101 deletions.
  1. +4 −3 api-tests/src/test/java/com/aixigo/preview/servant/rest/PREvantRestApiDockerTest.java
  2. +4 −3 api-tests/src/test/java/com/aixigo/preview/servant/rest/junit/extension/PREvantRestApiExtension.java
  3. +4 −3 api-tests/src/test/java/com/aixigo/preview/servant/rest/model/ServiceConfiguration.java
  4. +5 −4 api/src/apps.rs
  5. +5 −4 api/src/commands/create_app_command.rs
  6. +5 −4 api/src/commands/delete_app_command.rs
  7. +5 −4 api/src/commands/list_apps_command.rs
  8. +5 −4 api/src/commands/list_tickets_command.rs
  9. +5 −4 api/src/commands/mod.rs
  10. +5 −4 api/src/main.rs
  11. +5 −4 api/src/models/mod.rs
  12. +5 −4 api/src/models/request_info.rs
  13. +5 −4 api/src/models/service.rs
  14. +5 −4 api/src/models/ticket_info.rs
  15. +5 −4 api/src/models/web_hook_info.rs
  16. +5 −4 api/src/services/apps_service.rs
  17. +5 −4 api/src/services/config_service.rs
  18. +4 −3 api/src/services/docker/docker_infrastructure.rs
  19. +4 −3 api/src/services/docker/mod.rs
  20. +3 −2 api/src/services/images_service.rs
  21. +4 −3 api/src/services/infrastructure.rs
  22. +5 −4 api/src/services/mod.rs
  23. +4 −3 api/src/services/service_templating.rs
  24. +5 −4 api/src/webhooks.rs
  25. +2 −1 frontend/src/App.vue
  26. +2 −1 frontend/src/Navbar.vue
  27. +2 −1 frontend/src/ReviewAppCard.vue
  28. +2 −1 frontend/src/ShutdownAppDialog.vue
  29. +2 −1 frontend/src/app.js
  30. +2 −1 frontend/src/scss/_application.scss
  31. +2 −1 frontend/src/scss/_badge.scss
  32. +2 −1 frontend/src/scss/_basics.scss
  33. +2 −1 frontend/src/scss/_card.scss
  34. +2 −1 frontend/src/scss/_colors.scss
  35. +2 −1 frontend/src/scss/_menu.scss
  36. +2 −1 frontend/src/scss/_review-app-card.scss
  37. +2 −1 frontend/src/scss/theme.scss
  38. +2 −1 frontend/src/store/index.js
@@ -4,18 +4,18 @@
* ========================LICENSE_START=================================
* PREvant REST API Integration Tests
* %%
* Copyright (C) 2018 aixigo AG
* Copyright (C) 2018 - 2019 aixigo AG
* %%
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -26,6 +26,7 @@
* =========================LICENSE_END==================================
*/


import com.aixigo.preview.servant.rest.junit.extension.PREvantRestApiExtension;
import com.aixigo.preview.servant.rest.model.ServiceConfiguration;
import io.restassured.response.ValidatableResponse;
@@ -4,18 +4,18 @@
* ========================LICENSE_START=================================
* PREvant REST API Integration Tests
* %%
* Copyright (C) 2018 aixigo AG
* Copyright (C) 2018 - 2019 aixigo AG
* %%
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -26,6 +26,7 @@
* =========================LICENSE_END==================================
*/


import org.junit.jupiter.api.extension.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -4,18 +4,18 @@
* ========================LICENSE_START=================================
* PREvant REST API Integration Tests
* %%
* Copyright (C) 2018 aixigo AG
* Copyright (C) 2018 - 2019 aixigo AG
* %%
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -26,6 +26,7 @@
* =========================LICENSE_END==================================
*/


import lombok.Data;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
@@ -1,19 +1,19 @@
/*-
* ========================LICENSE_START=================================
* PREvant
* PREvant REST API
* %%
* Copyright (C) 2018 aixigo AG
* Copyright (C) 2018 - 2019 aixigo AG
* %%
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -23,6 +23,7 @@
* THE SOFTWARE.
* =========================LICENSE_END==================================
*/

use crate::commands::create_app_command::{CreateOrUpdateAppCommand, CreateOrUpdateError};
use crate::commands::delete_app_command::{DeleteAppCommand, DeleteAppError};
use crate::commands::list_apps_command::{ListAppsCommand, ListAppsError};
@@ -1,19 +1,19 @@
/*-
* ========================LICENSE_START=================================
* PREvant
* PREvant REST API
* %%
* Copyright (C) 2018 aixigo AG
* Copyright (C) 2018 - 2019 aixigo AG
* %%
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -23,6 +23,7 @@
* THE SOFTWARE.
* =========================LICENSE_END==================================
*/

use crate::models::request_info::RequestInfo;
use crate::models::service::{Service, ServiceConfig, ServiceError};
use crate::services::apps_service::{AppsService, AppsServiceError};
@@ -1,19 +1,19 @@
/*-
* ========================LICENSE_START=================================
* PREvant
* PREvant REST API
* %%
* Copyright (C) 2018 aixigo AG
* Copyright (C) 2018 - 2019 aixigo AG
* %%
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -23,6 +23,7 @@
* THE SOFTWARE.
* =========================LICENSE_END==================================
*/

use crate::models::request_info::RequestInfo;
use crate::models::service::Service;
use crate::services::apps_service::{AppsService, AppsServiceError};
@@ -1,19 +1,19 @@
/*-
* ========================LICENSE_START=================================
* PREvant
* PREvant REST API
* %%
* Copyright (C) 2018 aixigo AG
* Copyright (C) 2018 - 2019 aixigo AG
* %%
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -23,6 +23,7 @@
* THE SOFTWARE.
* =========================LICENSE_END==================================
*/

use crate::models::request_info::RequestInfo;
use crate::models::service::Service;
use crate::services::apps_service::{AppsService, AppsServiceError};
@@ -1,19 +1,19 @@
/*-
* ========================LICENSE_START=================================
* PREvant
* PREvant REST API
* %%
* Copyright (C) 2018 aixigo AG
* Copyright (C) 2018 - 2019 aixigo AG
* %%
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -23,6 +23,7 @@
* THE SOFTWARE.
* =========================LICENSE_END==================================
*/

use crate::models::ticket_info::TicketInfo;
use crate::services::apps_service::{AppsService, AppsServiceError};
use crate::services::config_service::{Config, ConfigError};
@@ -1,19 +1,19 @@
/*-
* ========================LICENSE_START=================================
* PREvant
* PREvant REST API
* %%
* Copyright (C) 2018 aixigo AG
* Copyright (C) 2018 - 2019 aixigo AG
* %%
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -23,6 +23,7 @@
* THE SOFTWARE.
* =========================LICENSE_END==================================
*/

pub mod create_app_command;
pub mod delete_app_command;
pub mod list_apps_command;
@@ -1,19 +1,19 @@
/*-
* ========================LICENSE_START=================================
* PREvant
* PREvant REST API
* %%
* Copyright (C) 2018 aixigo AG
* Copyright (C) 2018 - 2019 aixigo AG
* %%
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -23,6 +23,7 @@
* THE SOFTWARE.
* =========================LICENSE_END==================================
*/

#![feature(proc_macro_hygiene, decl_macro, try_from)]

extern crate crossbeam_utils;
@@ -1,19 +1,19 @@
/*-
* ========================LICENSE_START=================================
* PREvant
* PREvant REST API
* %%
* Copyright (C) 2018 aixigo AG
* Copyright (C) 2018 - 2019 aixigo AG
* %%
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -23,6 +23,7 @@
* THE SOFTWARE.
* =========================LICENSE_END==================================
*/

pub mod request_info;
pub mod service;
pub mod ticket_info;
@@ -1,19 +1,19 @@
/*-
* ========================LICENSE_START=================================
* PREvant
* PREvant REST API
* %%
* Copyright (C) 2018 aixigo AG
* Copyright (C) 2018 - 2019 aixigo AG
* %%
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -23,6 +23,7 @@
* THE SOFTWARE.
* =========================LICENSE_END==================================
*/

use rocket::http::Status;
use rocket::request::{self, FromRequest, Request};
use rocket::Outcome;
Oops, something went wrong.

0 comments on commit 881ec9c

Please sign in to comment.