Skip to content

Commit

Permalink
Merge branch '0.01' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
oliviers12 authored Sep 28, 2024
2 parents ec32e47 + c6f7c4b commit 4cb0f5b
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 14 deletions.
11 changes: 4 additions & 7 deletions src/datasource.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,9 @@ use actix_web::{web, App, HttpResponse, HttpServer};
use serde::Deserialize;

// fichier suplementiare
mod schema;
mod edit;
mod deploiement;
mod datasource_postgresql;

// definir les structure depuit le shema
use crate::edit;
use crate::deploiement;
use crate::datasource_postgresql;
use crate::schema::*;

// Structure de base de données
Expand All @@ -30,7 +27,7 @@ pub async fn create_or_update_cluster(cluster_name: &str, config: Config, data:
HttpResponse::Ok().body("Cluster updated successfully!")
}

ub async fn delete_cluster_source(cluster_name: String, data: web::Data<Database>) -> HttpResponse {
pub async fn delete_cluster_source(cluster_name: String, data: web::Data<Database>) -> HttpResponse {
// Appeler la fonction de suppression dans datasource_postgresql
datasource_postgresql::remove_cluster_source(cluster_name, data).await;
HttpResponse::Ok().body("Cluster source deleted successfully!")
Expand Down
5 changes: 2 additions & 3 deletions src/datasource_postgresql.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@
use diesel::prelude::*;

// fichier suplementiare
mod schema;

// mod schema; // Commenté ou supprimé
// definir les structure depuit le shema
use crate::schema::*;
use crate::schema;

// Implémentation de la base de données
impl Database {
Expand Down
6 changes: 2 additions & 4 deletions src/edit.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ use actix_web::{web, HttpResponse, Responder};
use serde_yaml;

// fichier suplementiare
mod schema;
// mod schema; // Commenté ou supprimé
// definir les structure depuit le shema
use crate::schema::*;
use crate::schema;

pub async fn edit_cluster(cluster_name: web::Path<String>) -> impl Responder {
let cluster_name = cluster_name.into_inner();
Expand Down Expand Up @@ -127,5 +127,3 @@ pub async fn save_yaml(cluster_name: web::Path<String>, yaml_content: web::Json<
fn is_valid_yaml(yaml_data: &str) -> bool {
// Implémentez une validation de base pour vérifier si le YAML est bien formé
!yaml_data.trim().is_empty() // Remplacez par une logique de validation plus robuste si nécessaire
}

2 changes: 2 additions & 0 deletions src/schema.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
// shema.rs
use diesel::{table, Insertable};
use serde::{Deserialize, Serialize};
// Définition de la table des nœuds de cluster
table! {
cluster_node (id) {
Expand Down

0 comments on commit 4cb0f5b

Please sign in to comment.